2005-04-17 00:20:36 +02:00
|
|
|
/*
|
2014-12-11 00:52:10 +01:00
|
|
|
* binfmt_misc.c
|
2005-04-17 00:20:36 +02:00
|
|
|
*
|
2014-12-11 00:52:10 +01:00
|
|
|
* Copyright (C) 1997 Richard Günther
|
2005-04-17 00:20:36 +02:00
|
|
|
*
|
2014-12-11 00:52:10 +01:00
|
|
|
* binfmt_misc detects binaries via a magic or filename extension and invokes
|
|
|
|
* a specified wrapper. See Documentation/binfmt_misc.txt for more details.
|
2005-04-17 00:20:36 +02:00
|
|
|
*/
|
|
|
|
|
2014-12-11 00:52:08 +01:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2015-04-16 21:44:56 +02:00
|
|
|
#include <linux/kernel.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
Detach sched.h from mm.h
First thing mm.h does is including sched.h solely for can_do_mlock() inline
function which has "current" dereference inside. By dealing with can_do_mlock()
mm.h can be detached from sched.h which is good. See below, why.
This patch
a) removes unconditional inclusion of sched.h from mm.h
b) makes can_do_mlock() normal function in mm/mlock.c
c) exports can_do_mlock() to not break compilation
d) adds sched.h inclusions back to files that were getting it indirectly.
e) adds less bloated headers to some files (asm/signal.h, jiffies.h) that were
getting them indirectly
Net result is:
a) mm.h users would get less code to open, read, preprocess, parse, ... if
they don't need sched.h
b) sched.h stops being dependency for significant number of files:
on x86_64 allmodconfig touching sched.h results in recompile of 4083 files,
after patch it's only 3744 (-8.3%).
Cross-compile tested on
all arm defconfigs, all mips defconfigs, all powerpc defconfigs,
alpha alpha-up
arm
i386 i386-up i386-defconfig i386-allnoconfig
ia64 ia64-up
m68k
mips
parisc parisc-up
powerpc powerpc-up
s390 s390-up
sparc sparc-up
sparc64 sparc64-up
um-x86_64
x86_64 x86_64-up x86_64-defconfig x86_64-allnoconfig
as well as my two usual configs.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-20 23:22:52 +02:00
|
|
|
#include <linux/sched.h>
|
2012-03-23 23:01:50 +01:00
|
|
|
#include <linux/magic.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/binfmts.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/ctype.h>
|
2013-05-01 00:27:33 +02:00
|
|
|
#include <linux/string_helpers.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/file.h>
|
|
|
|
#include <linux/pagemap.h>
|
|
|
|
#include <linux/namei.h>
|
|
|
|
#include <linux/mount.h>
|
|
|
|
#include <linux/syscalls.h>
|
2008-07-24 06:29:15 +02:00
|
|
|
#include <linux/fs.h>
|
2014-12-11 00:52:08 +01:00
|
|
|
#include <linux/uaccess.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2014-12-11 00:52:08 +01:00
|
|
|
#ifdef DEBUG
|
|
|
|
# define USE_DEBUG 1
|
|
|
|
#else
|
|
|
|
# define USE_DEBUG 0
|
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
enum {
|
|
|
|
VERBOSE_STATUS = 1 /* make it zero to save 400 bytes kernel memory */
|
|
|
|
};
|
|
|
|
|
|
|
|
static LIST_HEAD(entries);
|
|
|
|
static int enabled = 1;
|
|
|
|
|
|
|
|
enum {Enabled, Magic};
|
2014-12-11 00:52:10 +01:00
|
|
|
#define MISC_FMT_PRESERVE_ARGV0 (1 << 31)
|
|
|
|
#define MISC_FMT_OPEN_BINARY (1 << 30)
|
|
|
|
#define MISC_FMT_CREDENTIALS (1 << 29)
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
struct list_head list;
|
|
|
|
unsigned long flags; /* type, status, etc. */
|
|
|
|
int offset; /* offset of magic */
|
|
|
|
int size; /* size of magic/mask */
|
|
|
|
char *magic; /* magic or filename extension */
|
|
|
|
char *mask; /* mask, NULL for exact match */
|
|
|
|
char *interpreter; /* filename of interpreter */
|
|
|
|
char *name;
|
|
|
|
struct dentry *dentry;
|
|
|
|
} Node;
|
|
|
|
|
|
|
|
static DEFINE_RWLOCK(entries_lock);
|
2006-06-09 15:34:16 +02:00
|
|
|
static struct file_system_type bm_fs_type;
|
2005-04-17 00:20:36 +02:00
|
|
|
static struct vfsmount *bm_mnt;
|
|
|
|
static int entry_count;
|
|
|
|
|
binfmt_misc: expand the register format limit to 1920 bytes
The current code places a 256 byte limit on the registration format.
This ends up being fairly limited when you try to do matching against a
binary format like ELF:
- the magic & mask formats cannot have any embedded NUL chars
(string_unescape_inplace halts at the first NUL)
- each escape sequence quadruples the size: \x00 is needed for NUL
- trying to match bytes at the start of the file as well as further
on leads to a lot of \x00 sequences in the mask
- magic & mask have to be the same length (when decoded)
- still need bytes for the other fields
- impossible!
Let's look at a concrete (and common) example: using QEMU to run MIPS
ELFs. The name field uses 11 bytes "qemu-mipsel". The interp uses 20
bytes "/usr/bin/qemu-mipsel". The type & flags takes up 4 bytes. We
need 7 bytes for the delimiter (usually ":"). We can skip offset. So
already we're down to 107 bytes to use with the magic/mask instead of
the real limit of 128 (BINPRM_BUF_SIZE). If people use shell code to
register (which they do the majority of the time), they're down to ~26
possible bytes since the escape sequence must be \x##.
The ELF format looks like (both 32 & 64 bit):
e_ident: 16 bytes
e_type: 2 bytes
e_machine: 2 bytes
Those 20 bytes are enough for most architectures because they have so few
formats in the first place, thus they can be uniquely identified. That
also means for shell users, since 20 is smaller than 26, they can sanely
register a handler.
But for some targets (like MIPS), we need to poke further. The ELF fields
continue on:
e_entry: 4 or 8 bytes
e_phoff: 4 or 8 bytes
e_shoff: 4 or 8 bytes
e_flags: 4 bytes
We only care about e_flags here as that includes the bits to identify
whether the ELF is O32/N32/N64. But now we have to consume another 16
bytes (for 32 bit ELFs) or 28 bytes (for 64 bit ELFs) just to match the
flags. If every byte is escaped, we send 288 more bytes to the kernel
((20 {e_ident,e_type,e_machine} + 12 {e_entry,e_phoff,e_shoff} + 4
{e_flags}) * 2 {mask,magic} * 4 {escape}) and we've clearly blown our
budget.
Even if we try to be clever and do the decoding ourselves (rather than
relying on the kernel to process \x##), we still can't hit the mark --
string_unescape_inplace treats mask & magic as C strings so NUL cannot
be embedded. That leaves us with having to pass \x00 for the 12/24
entry/phoff/shoff bytes (as those will be completely random addresses),
and that is a minimum requirement of 48/96 bytes for the mask alone.
Add up the rest and we blow through it (this is for 64 bit ELFs):
magic: 20 {e_ident,e_type,e_machine} + 24 {e_entry,e_phoff,e_shoff} +
4 {e_flags} = 48 # ^^ See note below.
mask: 20 {e_ident,e_type,e_machine} + 96 {e_entry,e_phoff,e_shoff} +
4 {e_flags} = 120
Remember above we had 107 left over, and now we're at 168. This is of
course the *best* case scenario -- you'll also want to have NUL bytes
in the magic & mask too to match literal zeros.
Note: the reason we can use 24 in the magic is that we can work off of the
fact that for bytes the mask would clobber, we can stuff any value into
magic that we want. So when mask is \x00, we don't need the magic to also
be \x00, it can be an unescaped raw byte like '!'. This lets us handle
more formats (barely) under the current 256 limit, but that's a pretty
tall hoop to force people to jump through.
With all that said, let's bump the limit from 256 bytes to 1920. This way
we support escaping every byte of the mask & magic field (which is 1024
bytes by themselves -- 128 * 4 * 2), and we leave plenty of room for other
fields. Like long paths to the interpreter (when you have source in your
/really/long/homedir/qemu/foo). Since the current code stuffs more than
one structure into the same buffer, we leave a bit of space to easily
round up to 2k. 1920 is just as arbitrary as 256 ;).
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-10-14 00:52:03 +02:00
|
|
|
/*
|
|
|
|
* Max length of the register string. Determined by:
|
|
|
|
* - 7 delimiters
|
|
|
|
* - name: ~50 bytes
|
|
|
|
* - type: 1 byte
|
|
|
|
* - offset: 3 bytes (has to be smaller than BINPRM_BUF_SIZE)
|
|
|
|
* - magic: 128 bytes (512 in escaped form)
|
|
|
|
* - mask: 128 bytes (512 in escaped form)
|
|
|
|
* - interp: ~50 bytes
|
|
|
|
* - flags: 5 bytes
|
|
|
|
* Round that up a bit, and then back off to hold the internal data
|
|
|
|
* (like struct Node).
|
|
|
|
*/
|
|
|
|
#define MAX_REGISTER_LENGTH 1920
|
|
|
|
|
|
|
|
/*
|
2005-04-17 00:20:36 +02:00
|
|
|
* Check if we support the binfmt
|
|
|
|
* if we do, return the node, else NULL
|
|
|
|
* locking is done in load_misc_binary
|
|
|
|
*/
|
|
|
|
static Node *check_file(struct linux_binprm *bprm)
|
|
|
|
{
|
|
|
|
char *p = strrchr(bprm->interp, '.');
|
|
|
|
struct list_head *l;
|
|
|
|
|
2014-12-11 00:52:08 +01:00
|
|
|
/* Walk all the registered handlers. */
|
2005-04-17 00:20:36 +02:00
|
|
|
list_for_each(l, &entries) {
|
|
|
|
Node *e = list_entry(l, Node, list);
|
|
|
|
char *s;
|
|
|
|
int j;
|
|
|
|
|
2014-12-11 00:52:08 +01:00
|
|
|
/* Make sure this one is currently enabled. */
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!test_bit(Enabled, &e->flags))
|
|
|
|
continue;
|
|
|
|
|
2014-12-11 00:52:08 +01:00
|
|
|
/* Do matching based on extension if applicable. */
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!test_bit(Magic, &e->flags)) {
|
|
|
|
if (p && !strcmp(e->magic, p + 1))
|
|
|
|
return e;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2014-12-11 00:52:08 +01:00
|
|
|
/* Do matching based on magic & mask. */
|
2005-04-17 00:20:36 +02:00
|
|
|
s = bprm->buf + e->offset;
|
|
|
|
if (e->mask) {
|
|
|
|
for (j = 0; j < e->size; j++)
|
|
|
|
if ((*s++ ^ e->magic[j]) & e->mask[j])
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
for (j = 0; j < e->size; j++)
|
|
|
|
if ((*s++ ^ e->magic[j]))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (j == e->size)
|
|
|
|
return e;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* the loader itself
|
|
|
|
*/
|
2012-10-21 04:00:48 +02:00
|
|
|
static int load_misc_binary(struct linux_binprm *bprm)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
Node *fmt;
|
2014-12-11 00:52:10 +01:00
|
|
|
struct file *interp_file = NULL;
|
2005-04-17 00:20:36 +02:00
|
|
|
char iname[BINPRM_BUF_SIZE];
|
2010-08-18 00:52:56 +02:00
|
|
|
const char *iname_addr = iname;
|
2005-04-17 00:20:36 +02:00
|
|
|
int retval;
|
|
|
|
int fd_binary = -1;
|
|
|
|
|
|
|
|
retval = -ENOEXEC;
|
|
|
|
if (!enabled)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto ret;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* to keep locking time low, we copy the interpreter string */
|
|
|
|
read_lock(&entries_lock);
|
|
|
|
fmt = check_file(bprm);
|
|
|
|
if (fmt)
|
|
|
|
strlcpy(iname, fmt->interpreter, BINPRM_BUF_SIZE);
|
|
|
|
read_unlock(&entries_lock);
|
|
|
|
if (!fmt)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto ret;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
syscalls: implement execveat() system call
This patchset adds execveat(2) for x86, and is derived from Meredydd
Luff's patch from Sept 2012 (https://lkml.org/lkml/2012/9/11/528).
The primary aim of adding an execveat syscall is to allow an
implementation of fexecve(3) that does not rely on the /proc filesystem,
at least for executables (rather than scripts). The current glibc version
of fexecve(3) is implemented via /proc, which causes problems in sandboxed
or otherwise restricted environments.
Given the desire for a /proc-free fexecve() implementation, HPA suggested
(https://lkml.org/lkml/2006/7/11/556) that an execveat(2) syscall would be
an appropriate generalization.
Also, having a new syscall means that it can take a flags argument without
back-compatibility concerns. The current implementation just defines the
AT_EMPTY_PATH and AT_SYMLINK_NOFOLLOW flags, but other flags could be
added in future -- for example, flags for new namespaces (as suggested at
https://lkml.org/lkml/2006/7/11/474).
Related history:
- https://lkml.org/lkml/2006/12/27/123 is an example of someone
realizing that fexecve() is likely to fail in a chroot environment.
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=514043 covered
documenting the /proc requirement of fexecve(3) in its manpage, to
"prevent other people from wasting their time".
- https://bugzilla.redhat.com/show_bug.cgi?id=241609 described a
problem where a process that did setuid() could not fexecve()
because it no longer had access to /proc/self/fd; this has since
been fixed.
This patch (of 4):
Add a new execveat(2) system call. execveat() is to execve() as openat()
is to open(): it takes a file descriptor that refers to a directory, and
resolves the filename relative to that.
In addition, if the filename is empty and AT_EMPTY_PATH is specified,
execveat() executes the file to which the file descriptor refers. This
replicates the functionality of fexecve(), which is a system call in other
UNIXen, but in Linux glibc it depends on opening "/proc/self/fd/<fd>" (and
so relies on /proc being mounted).
The filename fed to the executed program as argv[0] (or the name of the
script fed to a script interpreter) will be of the form "/dev/fd/<fd>"
(for an empty filename) or "/dev/fd/<fd>/<filename>", effectively
reflecting how the executable was found. This does however mean that
execution of a script in a /proc-less environment won't work; also, script
execution via an O_CLOEXEC file descriptor fails (as the file will not be
accessible after exec).
Based on patches by Meredydd Luff.
Signed-off-by: David Drysdale <drysdale@google.com>
Cc: Meredydd Luff <meredydd@senatehouse.org>
Cc: Shuah Khan <shuah.kh@samsung.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Rich Felker <dalias@aerifal.cx>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-12-13 01:57:29 +01:00
|
|
|
/* Need to be able to load the file after exec */
|
|
|
|
if (bprm->interp_flags & BINPRM_FLAGS_PATH_INACCESSIBLE)
|
|
|
|
return -ENOENT;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!(fmt->flags & MISC_FMT_PRESERVE_ARGV0)) {
|
2007-07-19 10:48:16 +02:00
|
|
|
retval = remove_arg_zero(bprm);
|
|
|
|
if (retval)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto ret;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (fmt->flags & MISC_FMT_OPEN_BINARY) {
|
|
|
|
|
|
|
|
/* if the binary should be opened on behalf of the
|
|
|
|
* interpreter than keep it open and assign descriptor
|
2014-12-11 00:52:10 +01:00
|
|
|
* to it
|
|
|
|
*/
|
2014-12-11 00:45:42 +01:00
|
|
|
fd_binary = get_unused_fd_flags(0);
|
2014-12-11 00:52:10 +01:00
|
|
|
if (fd_binary < 0) {
|
|
|
|
retval = fd_binary;
|
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
fd_install(fd_binary, bprm->file);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* if the binary is not readable than enforce mm->dumpable=0
|
|
|
|
regardless of the interpreter's permissions */
|
2011-06-19 18:49:47 +02:00
|
|
|
would_dump(bprm, bprm->file);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
allow_write_access(bprm->file);
|
|
|
|
bprm->file = NULL;
|
|
|
|
|
|
|
|
/* mark the bprm that fd should be passed to interp */
|
|
|
|
bprm->interp_flags |= BINPRM_FLAGS_EXECFD;
|
|
|
|
bprm->interp_data = fd_binary;
|
|
|
|
|
2014-12-11 00:52:10 +01:00
|
|
|
} else {
|
|
|
|
allow_write_access(bprm->file);
|
|
|
|
fput(bprm->file);
|
|
|
|
bprm->file = NULL;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
/* make argv[1] be the path to the binary */
|
2014-12-11 00:52:10 +01:00
|
|
|
retval = copy_strings_kernel(1, &bprm->interp, bprm);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (retval < 0)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto error;
|
2005-04-17 00:20:36 +02:00
|
|
|
bprm->argc++;
|
|
|
|
|
|
|
|
/* add the interp as argv[0] */
|
2014-12-11 00:52:10 +01:00
|
|
|
retval = copy_strings_kernel(1, &iname_addr, bprm);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (retval < 0)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto error;
|
|
|
|
bprm->argc++;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
exec: do not leave bprm->interp on stack
If a series of scripts are executed, each triggering module loading via
unprintable bytes in the script header, kernel stack contents can leak
into the command line.
Normally execution of binfmt_script and binfmt_misc happens recursively.
However, when modules are enabled, and unprintable bytes exist in the
bprm->buf, execution will restart after attempting to load matching
binfmt modules. Unfortunately, the logic in binfmt_script and
binfmt_misc does not expect to get restarted. They leave bprm->interp
pointing to their local stack. This means on restart bprm->interp is
left pointing into unused stack memory which can then be copied into the
userspace argv areas.
After additional study, it seems that both recursion and restart remains
the desirable way to handle exec with scripts, misc, and modules. As
such, we need to protect the changes to interp.
This changes the logic to require allocation for any changes to the
bprm->interp. To avoid adding a new kmalloc to every exec, the default
value is left as-is. Only when passing through binfmt_script or
binfmt_misc does an allocation take place.
For a proof of concept, see DoTest.sh from:
http://www.halfdog.net/Security/2012/LinuxKernelBinfmtScriptStackDataDisclosure/
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: halfdog <me@halfdog.net>
Cc: P J P <ppandit@redhat.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-12-21 00:05:16 +01:00
|
|
|
/* Update interp in case binfmt_script needs it. */
|
|
|
|
retval = bprm_change_interp(iname, bprm);
|
|
|
|
if (retval < 0)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto error;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2014-12-11 00:52:10 +01:00
|
|
|
interp_file = open_exec(iname);
|
|
|
|
retval = PTR_ERR(interp_file);
|
|
|
|
if (IS_ERR(interp_file))
|
|
|
|
goto error;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
bprm->file = interp_file;
|
|
|
|
if (fmt->flags & MISC_FMT_CREDENTIALS) {
|
|
|
|
/*
|
|
|
|
* No need to call prepare_binprm(), it's already been
|
|
|
|
* done. bprm->buf is stale, update from interp_file.
|
|
|
|
*/
|
|
|
|
memset(bprm->buf, 0, BINPRM_BUF_SIZE);
|
|
|
|
retval = kernel_read(bprm->file, 0, bprm->buf, BINPRM_BUF_SIZE);
|
|
|
|
} else
|
2014-12-11 00:52:10 +01:00
|
|
|
retval = prepare_binprm(bprm);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (retval < 0)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto error;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2012-10-21 03:53:31 +02:00
|
|
|
retval = search_binary_handler(bprm);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (retval < 0)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto error;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2014-12-11 00:52:10 +01:00
|
|
|
ret:
|
2005-04-17 00:20:36 +02:00
|
|
|
return retval;
|
2014-12-11 00:52:10 +01:00
|
|
|
error:
|
2005-04-17 00:20:36 +02:00
|
|
|
if (fd_binary > 0)
|
|
|
|
sys_close(fd_binary);
|
|
|
|
bprm->interp_flags = 0;
|
|
|
|
bprm->interp_data = 0;
|
2014-12-11 00:52:10 +01:00
|
|
|
goto ret;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Command parsers */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* parses and copies one argument enclosed in del from *sp to *dp,
|
|
|
|
* recognising the \x special.
|
|
|
|
* returns pointer to the copied argument or NULL in case of an
|
|
|
|
* error (and sets err) or null argument length.
|
|
|
|
*/
|
|
|
|
static char *scanarg(char *s, char del)
|
|
|
|
{
|
|
|
|
char c;
|
|
|
|
|
|
|
|
while ((c = *s++) != del) {
|
|
|
|
if (c == '\\' && *s == 'x') {
|
|
|
|
s++;
|
|
|
|
if (!isxdigit(*s++))
|
|
|
|
return NULL;
|
|
|
|
if (!isxdigit(*s++))
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2014-12-17 11:29:16 +01:00
|
|
|
s[-1] ='\0';
|
2005-04-17 00:20:36 +02:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2014-12-11 00:52:10 +01:00
|
|
|
static char *check_special_flags(char *sfs, Node *e)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2014-12-11 00:52:10 +01:00
|
|
|
char *p = sfs;
|
2005-04-17 00:20:36 +02:00
|
|
|
int cont = 1;
|
|
|
|
|
|
|
|
/* special flags */
|
|
|
|
while (cont) {
|
|
|
|
switch (*p) {
|
2014-12-11 00:52:10 +01:00
|
|
|
case 'P':
|
|
|
|
pr_debug("register: flag: P (preserve argv0)\n");
|
|
|
|
p++;
|
|
|
|
e->flags |= MISC_FMT_PRESERVE_ARGV0;
|
|
|
|
break;
|
|
|
|
case 'O':
|
|
|
|
pr_debug("register: flag: O (open binary)\n");
|
|
|
|
p++;
|
|
|
|
e->flags |= MISC_FMT_OPEN_BINARY;
|
|
|
|
break;
|
|
|
|
case 'C':
|
|
|
|
pr_debug("register: flag: C (preserve creds)\n");
|
|
|
|
p++;
|
|
|
|
/* this flags also implies the
|
|
|
|
open-binary flag */
|
|
|
|
e->flags |= (MISC_FMT_CREDENTIALS |
|
|
|
|
MISC_FMT_OPEN_BINARY);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
cont = 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
2014-12-11 00:52:10 +01:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* This registers a new binary format, it recognises the syntax
|
|
|
|
* ':name:type:offset:magic:mask:interpreter:flags'
|
|
|
|
* where the ':' is the IFS, that can be chosen with the first char
|
|
|
|
*/
|
|
|
|
static Node *create_entry(const char __user *buffer, size_t count)
|
|
|
|
{
|
|
|
|
Node *e;
|
|
|
|
int memsize, err;
|
|
|
|
char *buf, *p;
|
|
|
|
char del;
|
|
|
|
|
2014-12-11 00:52:08 +01:00
|
|
|
pr_debug("register: received %zu bytes\n", count);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/* some sanity checks */
|
|
|
|
err = -EINVAL;
|
binfmt_misc: expand the register format limit to 1920 bytes
The current code places a 256 byte limit on the registration format.
This ends up being fairly limited when you try to do matching against a
binary format like ELF:
- the magic & mask formats cannot have any embedded NUL chars
(string_unescape_inplace halts at the first NUL)
- each escape sequence quadruples the size: \x00 is needed for NUL
- trying to match bytes at the start of the file as well as further
on leads to a lot of \x00 sequences in the mask
- magic & mask have to be the same length (when decoded)
- still need bytes for the other fields
- impossible!
Let's look at a concrete (and common) example: using QEMU to run MIPS
ELFs. The name field uses 11 bytes "qemu-mipsel". The interp uses 20
bytes "/usr/bin/qemu-mipsel". The type & flags takes up 4 bytes. We
need 7 bytes for the delimiter (usually ":"). We can skip offset. So
already we're down to 107 bytes to use with the magic/mask instead of
the real limit of 128 (BINPRM_BUF_SIZE). If people use shell code to
register (which they do the majority of the time), they're down to ~26
possible bytes since the escape sequence must be \x##.
The ELF format looks like (both 32 & 64 bit):
e_ident: 16 bytes
e_type: 2 bytes
e_machine: 2 bytes
Those 20 bytes are enough for most architectures because they have so few
formats in the first place, thus they can be uniquely identified. That
also means for shell users, since 20 is smaller than 26, they can sanely
register a handler.
But for some targets (like MIPS), we need to poke further. The ELF fields
continue on:
e_entry: 4 or 8 bytes
e_phoff: 4 or 8 bytes
e_shoff: 4 or 8 bytes
e_flags: 4 bytes
We only care about e_flags here as that includes the bits to identify
whether the ELF is O32/N32/N64. But now we have to consume another 16
bytes (for 32 bit ELFs) or 28 bytes (for 64 bit ELFs) just to match the
flags. If every byte is escaped, we send 288 more bytes to the kernel
((20 {e_ident,e_type,e_machine} + 12 {e_entry,e_phoff,e_shoff} + 4
{e_flags}) * 2 {mask,magic} * 4 {escape}) and we've clearly blown our
budget.
Even if we try to be clever and do the decoding ourselves (rather than
relying on the kernel to process \x##), we still can't hit the mark --
string_unescape_inplace treats mask & magic as C strings so NUL cannot
be embedded. That leaves us with having to pass \x00 for the 12/24
entry/phoff/shoff bytes (as those will be completely random addresses),
and that is a minimum requirement of 48/96 bytes for the mask alone.
Add up the rest and we blow through it (this is for 64 bit ELFs):
magic: 20 {e_ident,e_type,e_machine} + 24 {e_entry,e_phoff,e_shoff} +
4 {e_flags} = 48 # ^^ See note below.
mask: 20 {e_ident,e_type,e_machine} + 96 {e_entry,e_phoff,e_shoff} +
4 {e_flags} = 120
Remember above we had 107 left over, and now we're at 168. This is of
course the *best* case scenario -- you'll also want to have NUL bytes
in the magic & mask too to match literal zeros.
Note: the reason we can use 24 in the magic is that we can work off of the
fact that for bytes the mask would clobber, we can stuff any value into
magic that we want. So when mask is \x00, we don't need the magic to also
be \x00, it can be an unescaped raw byte like '!'. This lets us handle
more formats (barely) under the current 256 limit, but that's a pretty
tall hoop to force people to jump through.
With all that said, let's bump the limit from 256 bytes to 1920. This way
we support escaping every byte of the mask & magic field (which is 1024
bytes by themselves -- 128 * 4 * 2), and we leave plenty of room for other
fields. Like long paths to the interpreter (when you have source in your
/really/long/homedir/qemu/foo). Since the current code stuffs more than
one structure into the same buffer, we leave a bit of space to easily
round up to 2k. 1920 is just as arbitrary as 256 ;).
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-10-14 00:52:03 +02:00
|
|
|
if ((count < 11) || (count > MAX_REGISTER_LENGTH))
|
2005-04-17 00:20:36 +02:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
err = -ENOMEM;
|
|
|
|
memsize = sizeof(Node) + count + 8;
|
2014-12-11 00:52:13 +01:00
|
|
|
e = kmalloc(memsize, GFP_KERNEL);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!e)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
p = buf = (char *)e + sizeof(Node);
|
|
|
|
|
|
|
|
memset(e, 0, sizeof(Node));
|
|
|
|
if (copy_from_user(buf, buffer, count))
|
2014-12-11 00:52:10 +01:00
|
|
|
goto efault;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
del = *p++; /* delimeter */
|
|
|
|
|
2014-12-11 00:52:08 +01:00
|
|
|
pr_debug("register: delim: %#x {%c}\n", del, del);
|
|
|
|
|
|
|
|
/* Pad the buffer with the delim to simplify parsing below. */
|
2014-12-11 00:52:10 +01:00
|
|
|
memset(buf + count, del, 8);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2014-12-11 00:52:08 +01:00
|
|
|
/* Parse the 'name' field. */
|
2005-04-17 00:20:36 +02:00
|
|
|
e->name = p;
|
|
|
|
p = strchr(p, del);
|
|
|
|
if (!p)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2005-04-17 00:20:36 +02:00
|
|
|
*p++ = '\0';
|
|
|
|
if (!e->name[0] ||
|
|
|
|
!strcmp(e->name, ".") ||
|
|
|
|
!strcmp(e->name, "..") ||
|
|
|
|
strchr(e->name, '/'))
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2014-12-11 00:52:08 +01:00
|
|
|
|
|
|
|
pr_debug("register: name: {%s}\n", e->name);
|
|
|
|
|
|
|
|
/* Parse the 'type' field. */
|
2005-04-17 00:20:36 +02:00
|
|
|
switch (*p++) {
|
2014-12-11 00:52:08 +01:00
|
|
|
case 'E':
|
|
|
|
pr_debug("register: type: E (extension)\n");
|
|
|
|
e->flags = 1 << Enabled;
|
|
|
|
break;
|
|
|
|
case 'M':
|
|
|
|
pr_debug("register: type: M (magic)\n");
|
|
|
|
e->flags = (1 << Enabled) | (1 << Magic);
|
|
|
|
break;
|
|
|
|
default:
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
if (*p++ != del)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2014-12-11 00:52:08 +01:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (test_bit(Magic, &e->flags)) {
|
2014-12-11 00:52:08 +01:00
|
|
|
/* Handle the 'M' (magic) format. */
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
/* Parse the 'offset' field. */
|
|
|
|
s = strchr(p, del);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!s)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2005-04-17 00:20:36 +02:00
|
|
|
*s++ = '\0';
|
|
|
|
e->offset = simple_strtoul(p, &p, 10);
|
|
|
|
if (*p++)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2014-12-11 00:52:08 +01:00
|
|
|
pr_debug("register: offset: %#x\n", e->offset);
|
|
|
|
|
|
|
|
/* Parse the 'magic' field. */
|
2005-04-17 00:20:36 +02:00
|
|
|
e->magic = p;
|
|
|
|
p = scanarg(p, del);
|
|
|
|
if (!p)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2014-12-17 11:29:16 +01:00
|
|
|
if (!e->magic[0])
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2014-12-11 00:52:08 +01:00
|
|
|
if (USE_DEBUG)
|
|
|
|
print_hex_dump_bytes(
|
|
|
|
KBUILD_MODNAME ": register: magic[raw]: ",
|
|
|
|
DUMP_PREFIX_NONE, e->magic, p - e->magic);
|
|
|
|
|
|
|
|
/* Parse the 'mask' field. */
|
2005-04-17 00:20:36 +02:00
|
|
|
e->mask = p;
|
|
|
|
p = scanarg(p, del);
|
|
|
|
if (!p)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2014-12-17 11:29:16 +01:00
|
|
|
if (!e->mask[0]) {
|
2005-04-17 00:20:36 +02:00
|
|
|
e->mask = NULL;
|
2014-12-11 00:52:08 +01:00
|
|
|
pr_debug("register: mask[raw]: none\n");
|
|
|
|
} else if (USE_DEBUG)
|
|
|
|
print_hex_dump_bytes(
|
|
|
|
KBUILD_MODNAME ": register: mask[raw]: ",
|
|
|
|
DUMP_PREFIX_NONE, e->mask, p - e->mask);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Decode the magic & mask fields.
|
|
|
|
* Note: while we might have accepted embedded NUL bytes from
|
|
|
|
* above, the unescape helpers here will stop at the first one
|
|
|
|
* it encounters.
|
|
|
|
*/
|
2013-05-01 00:27:33 +02:00
|
|
|
e->size = string_unescape_inplace(e->magic, UNESCAPE_HEX);
|
|
|
|
if (e->mask &&
|
|
|
|
string_unescape_inplace(e->mask, UNESCAPE_HEX) != e->size)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2005-04-17 00:20:36 +02:00
|
|
|
if (e->size + e->offset > BINPRM_BUF_SIZE)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2014-12-11 00:52:08 +01:00
|
|
|
pr_debug("register: magic/mask length: %i\n", e->size);
|
|
|
|
if (USE_DEBUG) {
|
|
|
|
print_hex_dump_bytes(
|
|
|
|
KBUILD_MODNAME ": register: magic[decoded]: ",
|
|
|
|
DUMP_PREFIX_NONE, e->magic, e->size);
|
|
|
|
|
|
|
|
if (e->mask) {
|
|
|
|
int i;
|
2014-12-11 00:52:13 +01:00
|
|
|
char *masked = kmalloc(e->size, GFP_KERNEL);
|
2014-12-11 00:52:08 +01:00
|
|
|
|
|
|
|
print_hex_dump_bytes(
|
|
|
|
KBUILD_MODNAME ": register: mask[decoded]: ",
|
|
|
|
DUMP_PREFIX_NONE, e->mask, e->size);
|
|
|
|
|
|
|
|
if (masked) {
|
|
|
|
for (i = 0; i < e->size; ++i)
|
|
|
|
masked[i] = e->magic[i] & e->mask[i];
|
|
|
|
print_hex_dump_bytes(
|
|
|
|
KBUILD_MODNAME ": register: magic[masked]: ",
|
|
|
|
DUMP_PREFIX_NONE, masked, e->size);
|
|
|
|
|
|
|
|
kfree(masked);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
} else {
|
2014-12-11 00:52:08 +01:00
|
|
|
/* Handle the 'E' (extension) format. */
|
|
|
|
|
|
|
|
/* Skip the 'offset' field. */
|
2005-04-17 00:20:36 +02:00
|
|
|
p = strchr(p, del);
|
|
|
|
if (!p)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2005-04-17 00:20:36 +02:00
|
|
|
*p++ = '\0';
|
2014-12-11 00:52:08 +01:00
|
|
|
|
|
|
|
/* Parse the 'magic' field. */
|
2005-04-17 00:20:36 +02:00
|
|
|
e->magic = p;
|
|
|
|
p = strchr(p, del);
|
|
|
|
if (!p)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2005-04-17 00:20:36 +02:00
|
|
|
*p++ = '\0';
|
|
|
|
if (!e->magic[0] || strchr(e->magic, '/'))
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2014-12-11 00:52:08 +01:00
|
|
|
pr_debug("register: extension: {%s}\n", e->magic);
|
|
|
|
|
|
|
|
/* Skip the 'mask' field. */
|
2005-04-17 00:20:36 +02:00
|
|
|
p = strchr(p, del);
|
|
|
|
if (!p)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2005-04-17 00:20:36 +02:00
|
|
|
*p++ = '\0';
|
|
|
|
}
|
2014-12-11 00:52:08 +01:00
|
|
|
|
|
|
|
/* Parse the 'interpreter' field. */
|
2005-04-17 00:20:36 +02:00
|
|
|
e->interpreter = p;
|
|
|
|
p = strchr(p, del);
|
|
|
|
if (!p)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2005-04-17 00:20:36 +02:00
|
|
|
*p++ = '\0';
|
|
|
|
if (!e->interpreter[0])
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
2014-12-11 00:52:08 +01:00
|
|
|
pr_debug("register: interpreter: {%s}\n", e->interpreter);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2014-12-11 00:52:08 +01:00
|
|
|
/* Parse the 'flags' field. */
|
2014-12-11 00:52:10 +01:00
|
|
|
p = check_special_flags(p, e);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (*p == '\n')
|
|
|
|
p++;
|
|
|
|
if (p != buf + count)
|
2014-12-11 00:52:10 +01:00
|
|
|
goto einval;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
return e;
|
|
|
|
|
|
|
|
out:
|
|
|
|
return ERR_PTR(err);
|
|
|
|
|
2014-12-11 00:52:10 +01:00
|
|
|
efault:
|
2005-04-17 00:20:36 +02:00
|
|
|
kfree(e);
|
|
|
|
return ERR_PTR(-EFAULT);
|
2014-12-11 00:52:10 +01:00
|
|
|
einval:
|
2005-04-17 00:20:36 +02:00
|
|
|
kfree(e);
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set status of entry/binfmt_misc:
|
|
|
|
* '1' enables, '0' disables and '-1' clears entry/binfmt_misc
|
|
|
|
*/
|
|
|
|
static int parse_command(const char __user *buffer, size_t count)
|
|
|
|
{
|
|
|
|
char s[4];
|
|
|
|
|
|
|
|
if (count > 3)
|
|
|
|
return -EINVAL;
|
|
|
|
if (copy_from_user(s, buffer, count))
|
|
|
|
return -EFAULT;
|
binfmt_misc: work around gcc-4.9 warning
gcc-4.9 on ARM gives us a mysterious warning about the binfmt_misc
parse_command function:
fs/binfmt_misc.c: In function 'parse_command.part.3':
fs/binfmt_misc.c:405:7: warning: array subscript is above array bounds [-Warray-bounds]
I've managed to trace this back to the ARM implementation of memset,
which is called from copy_from_user in case of a fault and which does
#define memset(p,v,n) \
({ \
void *__p = (p); size_t __n = n; \
if ((__n) != 0) { \
if (__builtin_constant_p((v)) && (v) == 0) \
__memzero((__p),(__n)); \
else \
memset((__p),(v),(__n)); \
} \
(__p); \
})
Apparently gcc gets confused by the check for "size != 0" and believes
that the size might be zero when it gets to the line that does "if
(s[count-1] == '\n')", so it would access data outside of the array.
gcc is clearly wrong here, since this condition was already checked
earlier in the function and the 'size' value can not change in the
meantime.
Fortunately, we can work around it and get rid of the warning by
rearranging the function to check for zero size after doing the
copy_from_user. It is still safe to pass a zero size into
copy_from_user, so it does not cause any side effects.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-10-14 00:52:08 +02:00
|
|
|
if (!count)
|
|
|
|
return 0;
|
2014-12-11 00:52:10 +01:00
|
|
|
if (s[count - 1] == '\n')
|
2005-04-17 00:20:36 +02:00
|
|
|
count--;
|
|
|
|
if (count == 1 && s[0] == '0')
|
|
|
|
return 1;
|
|
|
|
if (count == 1 && s[0] == '1')
|
|
|
|
return 2;
|
|
|
|
if (count == 2 && s[0] == '-' && s[1] == '1')
|
|
|
|
return 3;
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* generic stuff */
|
|
|
|
|
|
|
|
static void entry_status(Node *e, char *page)
|
|
|
|
{
|
2015-04-16 21:44:56 +02:00
|
|
|
char *dp = page;
|
|
|
|
const char *status = "disabled";
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (test_bit(Enabled, &e->flags))
|
|
|
|
status = "enabled";
|
|
|
|
|
|
|
|
if (!VERBOSE_STATUS) {
|
|
|
|
sprintf(page, "%s\n", status);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-04-16 21:44:56 +02:00
|
|
|
dp += sprintf(dp, "%s\ninterpreter %s\n", status, e->interpreter);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* print the special flags */
|
2015-04-16 21:44:56 +02:00
|
|
|
dp += sprintf(dp, "flags: ");
|
2014-12-11 00:52:10 +01:00
|
|
|
if (e->flags & MISC_FMT_PRESERVE_ARGV0)
|
|
|
|
*dp++ = 'P';
|
|
|
|
if (e->flags & MISC_FMT_OPEN_BINARY)
|
|
|
|
*dp++ = 'O';
|
|
|
|
if (e->flags & MISC_FMT_CREDENTIALS)
|
|
|
|
*dp++ = 'C';
|
|
|
|
*dp++ = '\n';
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (!test_bit(Magic, &e->flags)) {
|
|
|
|
sprintf(dp, "extension .%s\n", e->magic);
|
|
|
|
} else {
|
2015-04-16 21:44:56 +02:00
|
|
|
dp += sprintf(dp, "offset %i\nmagic ", e->offset);
|
|
|
|
dp = bin2hex(dp, e->magic, e->size);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (e->mask) {
|
2015-04-16 21:44:56 +02:00
|
|
|
dp += sprintf(dp, "\nmask ");
|
|
|
|
dp = bin2hex(dp, e->mask, e->size);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
*dp++ = '\n';
|
|
|
|
*dp = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct inode *bm_get_inode(struct super_block *sb, int mode)
|
|
|
|
{
|
2014-12-11 00:52:10 +01:00
|
|
|
struct inode *inode = new_inode(sb);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (inode) {
|
2010-10-23 17:19:54 +02:00
|
|
|
inode->i_ino = get_next_ino();
|
2005-04-17 00:20:36 +02:00
|
|
|
inode->i_mode = mode;
|
|
|
|
inode->i_atime = inode->i_mtime = inode->i_ctime =
|
|
|
|
current_fs_time(inode->i_sb);
|
|
|
|
}
|
|
|
|
return inode;
|
|
|
|
}
|
|
|
|
|
2010-06-07 20:34:48 +02:00
|
|
|
static void bm_evict_inode(struct inode *inode)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2012-05-03 14:48:02 +02:00
|
|
|
clear_inode(inode);
|
2006-09-27 10:50:46 +02:00
|
|
|
kfree(inode->i_private);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void kill_node(Node *e)
|
|
|
|
{
|
|
|
|
struct dentry *dentry;
|
|
|
|
|
|
|
|
write_lock(&entries_lock);
|
|
|
|
dentry = e->dentry;
|
|
|
|
if (dentry) {
|
|
|
|
list_del_init(&e->list);
|
|
|
|
e->dentry = NULL;
|
|
|
|
}
|
|
|
|
write_unlock(&entries_lock);
|
|
|
|
|
|
|
|
if (dentry) {
|
2015-03-17 23:26:12 +01:00
|
|
|
drop_nlink(d_inode(dentry));
|
2005-04-17 00:20:36 +02:00
|
|
|
d_drop(dentry);
|
|
|
|
dput(dentry);
|
|
|
|
simple_release_fs(&bm_mnt, &entry_count);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* /<entry> */
|
|
|
|
|
|
|
|
static ssize_t
|
2014-12-11 00:52:10 +01:00
|
|
|
bm_entry_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2013-01-23 23:07:38 +01:00
|
|
|
Node *e = file_inode(file)->i_private;
|
2005-04-17 00:20:36 +02:00
|
|
|
ssize_t res;
|
|
|
|
char *page;
|
|
|
|
|
2014-12-11 00:52:10 +01:00
|
|
|
page = (char *) __get_free_page(GFP_KERNEL);
|
|
|
|
if (!page)
|
2005-04-17 00:20:36 +02:00
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
entry_status(e, page);
|
|
|
|
|
2008-07-24 06:29:15 +02:00
|
|
|
res = simple_read_from_buffer(buf, nbytes, ppos, page, strlen(page));
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
free_page((unsigned long) page);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t bm_entry_write(struct file *file, const char __user *buffer,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct dentry *root;
|
2013-01-23 23:07:38 +01:00
|
|
|
Node *e = file_inode(file)->i_private;
|
2005-04-17 00:20:36 +02:00
|
|
|
int res = parse_command(buffer, count);
|
|
|
|
|
|
|
|
switch (res) {
|
2014-12-11 00:52:10 +01:00
|
|
|
case 1:
|
|
|
|
/* Disable this handler. */
|
|
|
|
clear_bit(Enabled, &e->flags);
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
/* Enable this handler. */
|
|
|
|
set_bit(Enabled, &e->flags);
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
/* Delete this handler. */
|
|
|
|
root = dget(file->f_path.dentry->d_sb->s_root);
|
2016-01-22 21:40:57 +01:00
|
|
|
inode_lock(d_inode(root));
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2014-12-11 00:52:10 +01:00
|
|
|
kill_node(e);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2016-01-22 21:40:57 +01:00
|
|
|
inode_unlock(d_inode(root));
|
2014-12-11 00:52:10 +01:00
|
|
|
dput(root);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return res;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2014-12-11 00:52:10 +01:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2006-03-28 11:56:42 +02:00
|
|
|
static const struct file_operations bm_entry_operations = {
|
2005-04-17 00:20:36 +02:00
|
|
|
.read = bm_entry_read,
|
|
|
|
.write = bm_entry_write,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 18:52:59 +02:00
|
|
|
.llseek = default_llseek,
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/* /register */
|
|
|
|
|
|
|
|
static ssize_t bm_register_write(struct file *file, const char __user *buffer,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
Node *e;
|
|
|
|
struct inode *inode;
|
|
|
|
struct dentry *root, *dentry;
|
2011-12-08 00:16:57 +01:00
|
|
|
struct super_block *sb = file->f_path.dentry->d_sb;
|
2005-04-17 00:20:36 +02:00
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
e = create_entry(buffer, count);
|
|
|
|
|
|
|
|
if (IS_ERR(e))
|
|
|
|
return PTR_ERR(e);
|
|
|
|
|
|
|
|
root = dget(sb->s_root);
|
2016-01-22 21:40:57 +01:00
|
|
|
inode_lock(d_inode(root));
|
2005-04-17 00:20:36 +02:00
|
|
|
dentry = lookup_one_len(e->name, root, strlen(e->name));
|
|
|
|
err = PTR_ERR(dentry);
|
|
|
|
if (IS_ERR(dentry))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
err = -EEXIST;
|
2015-03-17 23:26:12 +01:00
|
|
|
if (d_really_is_positive(dentry))
|
2005-04-17 00:20:36 +02:00
|
|
|
goto out2;
|
|
|
|
|
|
|
|
inode = bm_get_inode(sb, S_IFREG | 0644);
|
|
|
|
|
|
|
|
err = -ENOMEM;
|
|
|
|
if (!inode)
|
|
|
|
goto out2;
|
|
|
|
|
2006-06-09 15:34:16 +02:00
|
|
|
err = simple_pin_fs(&bm_fs_type, &bm_mnt, &entry_count);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (err) {
|
|
|
|
iput(inode);
|
|
|
|
inode = NULL;
|
|
|
|
goto out2;
|
|
|
|
}
|
|
|
|
|
|
|
|
e->dentry = dget(dentry);
|
2006-09-27 10:50:46 +02:00
|
|
|
inode->i_private = e;
|
2005-04-17 00:20:36 +02:00
|
|
|
inode->i_fop = &bm_entry_operations;
|
|
|
|
|
|
|
|
d_instantiate(dentry, inode);
|
|
|
|
write_lock(&entries_lock);
|
|
|
|
list_add(&e->list, &entries);
|
|
|
|
write_unlock(&entries_lock);
|
|
|
|
|
|
|
|
err = 0;
|
|
|
|
out2:
|
|
|
|
dput(dentry);
|
|
|
|
out:
|
2016-01-22 21:40:57 +01:00
|
|
|
inode_unlock(d_inode(root));
|
2005-04-17 00:20:36 +02:00
|
|
|
dput(root);
|
|
|
|
|
|
|
|
if (err) {
|
|
|
|
kfree(e);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2006-03-28 11:56:42 +02:00
|
|
|
static const struct file_operations bm_register_operations = {
|
2005-04-17 00:20:36 +02:00
|
|
|
.write = bm_register_write,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 18:52:59 +02:00
|
|
|
.llseek = noop_llseek,
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/* /status */
|
|
|
|
|
|
|
|
static ssize_t
|
|
|
|
bm_status_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
|
|
|
|
{
|
2009-01-06 23:41:38 +01:00
|
|
|
char *s = enabled ? "enabled\n" : "disabled\n";
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-05-09 11:33:32 +02:00
|
|
|
return simple_read_from_buffer(buf, nbytes, ppos, s, strlen(s));
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2014-12-11 00:52:10 +01:00
|
|
|
static ssize_t bm_status_write(struct file *file, const char __user *buffer,
|
2005-04-17 00:20:36 +02:00
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
int res = parse_command(buffer, count);
|
|
|
|
struct dentry *root;
|
|
|
|
|
|
|
|
switch (res) {
|
2014-12-11 00:52:10 +01:00
|
|
|
case 1:
|
|
|
|
/* Disable all handlers. */
|
|
|
|
enabled = 0;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
/* Enable all handlers. */
|
|
|
|
enabled = 1;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
/* Delete all handlers. */
|
|
|
|
root = dget(file->f_path.dentry->d_sb->s_root);
|
2016-01-22 21:40:57 +01:00
|
|
|
inode_lock(d_inode(root));
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2014-12-11 00:52:10 +01:00
|
|
|
while (!list_empty(&entries))
|
|
|
|
kill_node(list_entry(entries.next, Node, list));
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2016-01-22 21:40:57 +01:00
|
|
|
inode_unlock(d_inode(root));
|
2014-12-11 00:52:10 +01:00
|
|
|
dput(root);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return res;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2014-12-11 00:52:10 +01:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2006-03-28 11:56:42 +02:00
|
|
|
static const struct file_operations bm_status_operations = {
|
2005-04-17 00:20:36 +02:00
|
|
|
.read = bm_status_read,
|
|
|
|
.write = bm_status_write,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 18:52:59 +02:00
|
|
|
.llseek = default_llseek,
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Superblock handling */
|
|
|
|
|
2007-02-12 09:55:41 +01:00
|
|
|
static const struct super_operations s_ops = {
|
2005-04-17 00:20:36 +02:00
|
|
|
.statfs = simple_statfs,
|
2010-06-07 20:34:48 +02:00
|
|
|
.evict_inode = bm_evict_inode,
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
2014-12-11 00:52:10 +01:00
|
|
|
static int bm_fill_super(struct super_block *sb, void *data, int silent)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2014-12-11 00:52:10 +01:00
|
|
|
int err;
|
2005-04-17 00:20:36 +02:00
|
|
|
static struct tree_descr bm_files[] = {
|
2007-05-08 09:32:31 +02:00
|
|
|
[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
|
|
|
|
[3] = {"register", &bm_register_operations, S_IWUSR},
|
2005-04-17 00:20:36 +02:00
|
|
|
/* last one */ {""}
|
|
|
|
};
|
2014-12-11 00:52:10 +01:00
|
|
|
|
|
|
|
err = simple_fill_super(sb, BINFMTFS_MAGIC, bm_files);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!err)
|
|
|
|
sb->s_op = &s_ops;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2010-07-24 23:48:30 +02:00
|
|
|
static struct dentry *bm_mount(struct file_system_type *fs_type,
|
|
|
|
int flags, const char *dev_name, void *data)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2010-07-24 23:48:30 +02:00
|
|
|
return mount_single(fs_type, flags, data, bm_fill_super);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct linux_binfmt misc_format = {
|
|
|
|
.module = THIS_MODULE,
|
|
|
|
.load_binary = load_misc_binary,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct file_system_type bm_fs_type = {
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.name = "binfmt_misc",
|
2010-07-24 23:48:30 +02:00
|
|
|
.mount = bm_mount,
|
2005-04-17 00:20:36 +02:00
|
|
|
.kill_sb = kill_litter_super,
|
|
|
|
};
|
2013-03-03 04:39:14 +01:00
|
|
|
MODULE_ALIAS_FS("binfmt_misc");
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
static int __init init_misc_binfmt(void)
|
|
|
|
{
|
|
|
|
int err = register_filesystem(&bm_fs_type);
|
2012-03-17 08:05:16 +01:00
|
|
|
if (!err)
|
|
|
|
insert_binfmt(&misc_format);
|
2005-04-17 00:20:36 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit exit_misc_binfmt(void)
|
|
|
|
{
|
|
|
|
unregister_binfmt(&misc_format);
|
|
|
|
unregister_filesystem(&bm_fs_type);
|
|
|
|
}
|
|
|
|
|
|
|
|
core_initcall(init_misc_binfmt);
|
|
|
|
module_exit(exit_misc_binfmt);
|
|
|
|
MODULE_LICENSE("GPL");
|