forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'akpm' (patches from Andrew Morton)
Merge second patch-bomb from Andrew Morton: - a few hotfixes - drivers/dma updates - MAINTAINERS updates - Quite a lot of lib/ updates - checkpatch updates - binfmt updates - autofs4 - drivers/rtc/ - various small tweaks to less used filesystems - ipc/ updates - kernel/watchdog.c changes * emailed patches from Andrew Morton <[email protected]>: (135 commits) mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared kernel/param: consolidate __{start,stop}___param[] in <linux/moduleparam.h> ia64: remove duplicate declarations of __per_cpu_start[] and __per_cpu_end[] frv: remove unused declarations of __start___ex_table and __stop___ex_table kvm: ensure hard lockup detection is disabled by default kernel/watchdog.c: control hard lockup detection default staging: rtl8192u: use %*pEn to escape buffer staging: rtl8192e: use %*pEn to escape buffer staging: wlan-ng: use %*pEhp to print SN lib80211: remove unused print_ssid() wireless: hostap: proc: print properly escaped SSID wireless: ipw2x00: print SSID via %*pE wireless: libertas: print esaped string via %*pE lib/vsprintf: add %*pE[achnops] format specifier lib / string_helpers: introduce string_escape_mem() lib / string_helpers: refactoring the test suite lib / string_helpers: move documentation to c-file include/linux: remove strict_strto* definitions arch/x86/mm/numa.c: fix boot failure when all nodes are hotpluggable fs: check bh blocknr earlier when searching lru ...
- Loading branch information
Showing
150 changed files
with
5,589 additions
and
1,657 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,39 +15,50 @@ First you must mount binfmt_misc: | |
mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc | ||
|
||
To actually register a new binary type, you have to set up a string looking like | ||
:name:type:offset:magic:mask:interpreter:flags (where you can choose the ':' upon | ||
your needs) and echo it to /proc/sys/fs/binfmt_misc/register. | ||
:name:type:offset:magic:mask:interpreter:flags (where you can choose the ':' | ||
upon your needs) and echo it to /proc/sys/fs/binfmt_misc/register. | ||
|
||
Here is what the fields mean: | ||
- 'name' is an identifier string. A new /proc file will be created with this | ||
name below /proc/sys/fs/binfmt_misc | ||
name below /proc/sys/fs/binfmt_misc; cannot contain slashes '/' for obvious | ||
reasons. | ||
- 'type' is the type of recognition. Give 'M' for magic and 'E' for extension. | ||
- 'offset' is the offset of the magic/mask in the file, counted in bytes. This | ||
defaults to 0 if you omit it (i.e. you write ':name:type::magic...') | ||
defaults to 0 if you omit it (i.e. you write ':name:type::magic...'). Ignored | ||
when using filename extension matching. | ||
- 'magic' is the byte sequence binfmt_misc is matching for. The magic string | ||
may contain hex-encoded characters like \x0a or \xA4. In a shell environment | ||
you will have to write \\x0a to prevent the shell from eating your \. | ||
may contain hex-encoded characters like \x0a or \xA4. Note that you must | ||
escape any NUL bytes; parsing halts at the first one. In a shell environment | ||
you might have to write \\x0a to prevent the shell from eating your \. | ||
If you chose filename extension matching, this is the extension to be | ||
recognised (without the '.', the \x0a specials are not allowed). Extension | ||
matching is case sensitive! | ||
matching is case sensitive, and slashes '/' are not allowed! | ||
- 'mask' is an (optional, defaults to all 0xff) mask. You can mask out some | ||
bits from matching by supplying a string like magic and as long as magic. | ||
The mask is anded with the byte sequence of the file. | ||
The mask is anded with the byte sequence of the file. Note that you must | ||
escape any NUL bytes; parsing halts at the first one. Ignored when using | ||
filename extension matching. | ||
- 'interpreter' is the program that should be invoked with the binary as first | ||
argument (specify the full path) | ||
- 'flags' is an optional field that controls several aspects of the invocation | ||
of the interpreter. It is a string of capital letters, each controls a certain | ||
aspect. The following flags are supported - | ||
'P' - preserve-argv[0]. Legacy behavior of binfmt_misc is to overwrite the | ||
original argv[0] with the full path to the binary. When this flag is | ||
included, binfmt_misc will add an argument to the argument vector for | ||
this purpose, thus preserving the original argv[0]. | ||
of the interpreter. It is a string of capital letters, each controls a | ||
certain aspect. The following flags are supported - | ||
'P' - preserve-argv[0]. Legacy behavior of binfmt_misc is to overwrite | ||
the original argv[0] with the full path to the binary. When this | ||
flag is included, binfmt_misc will add an argument to the argument | ||
vector for this purpose, thus preserving the original argv[0]. | ||
e.g. If your interp is set to /bin/foo and you run `blah` (which is | ||
in /usr/local/bin), then the kernel will execute /bin/foo with | ||
argv[] set to ["/bin/foo", "/usr/local/bin/blah", "blah"]. The | ||
interp has to be aware of this so it can execute /usr/local/bin/blah | ||
with argv[] set to ["blah"]. | ||
'O' - open-binary. Legacy behavior of binfmt_misc is to pass the full path | ||
of the binary to the interpreter as an argument. When this flag is | ||
included, binfmt_misc will open the file for reading and pass its | ||
descriptor as an argument, instead of the full path, thus allowing | ||
the interpreter to execute non-readable binaries. This feature should | ||
be used with care - the interpreter has to be trusted not to emit | ||
the contents of the non-readable binary. | ||
the interpreter to execute non-readable binaries. This feature | ||
should be used with care - the interpreter has to be trusted not to | ||
emit the contents of the non-readable binary. | ||
'C' - credentials. Currently, the behavior of binfmt_misc is to calculate | ||
the credentials and security token of the new process according to | ||
the interpreter. When this flag is included, these attributes are | ||
|
@@ -58,7 +69,7 @@ Here is what the fields mean: | |
|
||
|
||
There are some restrictions: | ||
- the whole register string may not exceed 255 characters | ||
- the whole register string may not exceed 1920 characters | ||
- the magic must reside in the first 128 bytes of the file, i.e. | ||
offset+size(magic) has to be less than 128 | ||
- the interpreter string may not exceed 127 characters | ||
|
@@ -110,7 +121,4 @@ passes it the full filename (or the file descriptor) to use. Using $PATH can | |
cause unexpected behaviour and can be a security hazard. | ||
|
||
|
||
There is a web page about binfmt_misc at | ||
http://www.tat.physik.uni-tuebingen.de | ||
|
||
Richard Günther <[email protected]> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
* TI BQ32000 I2C Serial Real-Time Clock | ||
|
||
Required properties: | ||
- compatible: Should contain "ti,bq32000". | ||
- reg: I2C address for chip | ||
|
||
Optional properties: | ||
- trickle-resistor-ohms : Selected resistor for trickle charger | ||
Values usable are 1120 and 20180 | ||
Should be given if trickle charger should be enabled | ||
- trickle-diode-disable : Do not use internal trickle charger diode | ||
Should be given if internal trickle charger diode should be disabled | ||
Example: | ||
bq32000: rtc@68 { | ||
compatible = "ti,bq32000"; | ||
trickle-resistor-ohms = <1120>; | ||
reg = <0x68>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
* Dallas DS1339 I2C Serial Real-Time Clock | ||
|
||
Required properties: | ||
- compatible: Should contain "dallas,ds1339". | ||
- reg: I2C address for chip | ||
|
||
Optional properties: | ||
- trickle-resistor-ohms : Selected resistor for trickle charger | ||
Values usable for ds1339 are 250, 2000, 4000 | ||
Should be given if trickle charger should be enabled | ||
- trickle-diode-disable : Do not use internal trickle charger diode | ||
Should be given if internal trickle charger diode should be disabled | ||
Example: | ||
ds1339: rtc@68 { | ||
compatible = "dallas,ds1339"; | ||
trickle-resistor-ohms = <250>; | ||
reg = <0x68>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.