nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

binfmt_misc: clean up code style a bit

Browse source 
Clean up various coding style issues that checkpatch complains about.
No functional changes here.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mike Frysinger 2014-12-10 15:52:10 -08:00 committed by Linus Torvalds
parent 6b899c4e9a
commit e6084d4a08
1 changed files with 145 additions and 148 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

163
fs/binfmt_misc.c
View file

@ -4,16 +4,7 @@
* Copyright (C) 1997 Richard Günther * Copyright (C) 1997 Richard Günther
* *
* binfmt_misc detects binaries via a magic or filename extension and invokes * binfmt_misc detects binaries via a magic or filename extension and invokes
* a specified wrapper. This should obsolete binfmt_java, binfmt_em86 and * a specified wrapper. See Documentation/binfmt_misc.txt for more details.
* binfmt_mz.
*
* 1997-04-25 first version
* [...]
* 1997-05-19 cleanup
* 1997-06-26 hpa: pass the real filename rather than argv[0]
* 1997-06-30 minor cleanup
* 1997-08-09 removed extension stripping, locking cleanup
* 2001-02-28 AV: rewritten into something that resembles C. Original didn't.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@ -48,9 +39,9 @@ static LIST_HEAD(entries);
static int enabled = 1; static int enabled = 1;
enum {Enabled, Magic}; enum {Enabled, Magic};
#define MISC_FMT_PRESERVE_ARGV0 (1<<31) #define MISC_FMT_PRESERVE_ARGV0 (1 << 31)
#define MISC_FMT_OPEN_BINARY (1<<30) #define MISC_FMT_OPEN_BINARY (1 << 30)
#define MISC_FMT_CREDENTIALS (1<<29) #define MISC_FMT_CREDENTIALS (1 << 29)
typedef struct { typedef struct {
struct list_head list; struct list_head list;
@ -134,7 +125,7 @@ static Node *check_file(struct linux_binprm *bprm)
static int load_misc_binary(struct linux_binprm *bprm) static int load_misc_binary(struct linux_binprm *bprm)
{ {
Node *fmt; Node *fmt;
struct file * interp_file = NULL; struct file *interp_file = NULL;
char iname[BINPRM_BUF_SIZE]; char iname[BINPRM_BUF_SIZE];
const char *iname_addr = iname; const char *iname_addr = iname;
int retval; int retval;
@ -142,7 +133,7 @@ static int load_misc_binary(struct linux_binprm *bprm)
retval = -ENOEXEC; retval = -ENOEXEC;
if (!enabled) if (!enabled)
goto _ret; goto ret;
/* to keep locking time low, we copy the interpreter string */ /* to keep locking time low, we copy the interpreter string */
read_lock(&entries_lock); read_lock(&entries_lock);
@ -151,23 +142,24 @@ static int load_misc_binary(struct linux_binprm *bprm)
strlcpy(iname, fmt->interpreter, BINPRM_BUF_SIZE); strlcpy(iname, fmt->interpreter, BINPRM_BUF_SIZE);
read_unlock(&entries_lock); read_unlock(&entries_lock);
if (!fmt) if (!fmt)
goto _ret; goto ret;
if (!(fmt->flags & MISC_FMT_PRESERVE_ARGV0)) { if (!(fmt->flags & MISC_FMT_PRESERVE_ARGV0)) {
retval = remove_arg_zero(bprm); retval = remove_arg_zero(bprm);
if (retval) if (retval)
goto _ret; goto ret;
} }
if (fmt->flags & MISC_FMT_OPEN_BINARY) { if (fmt->flags & MISC_FMT_OPEN_BINARY) {
/* if the binary should be opened on behalf of the /* if the binary should be opened on behalf of the
* interpreter than keep it open and assign descriptor * interpreter than keep it open and assign descriptor
* to it */ * to it
*/
fd_binary = get_unused_fd_flags(0); fd_binary = get_unused_fd_flags(0);
if (fd_binary < 0) { if (fd_binary < 0) {
retval = fd_binary; retval = fd_binary;
goto _ret; goto ret;
} }
fd_install(fd_binary, bprm->file); fd_install(fd_binary, bprm->file);
@ -188,26 +180,26 @@ static int load_misc_binary(struct linux_binprm *bprm)
bprm->file = NULL; bprm->file = NULL;
} }
/* make argv[1] be the path to the binary */ /* make argv[1] be the path to the binary */
retval = copy_strings_kernel (1, &bprm->interp, bprm); retval = copy_strings_kernel(1, &bprm->interp, bprm);
if (retval < 0) if (retval < 0)
goto _error; goto error;
bprm->argc++; bprm->argc++;
/* add the interp as argv[0] */ /* add the interp as argv[0] */
retval = copy_strings_kernel (1, &iname_addr, bprm); retval = copy_strings_kernel(1, &iname_addr, bprm);
if (retval < 0) if (retval < 0)
goto _error; goto error;
bprm->argc ++; bprm->argc++;
/* Update interp in case binfmt_script needs it. */ /* Update interp in case binfmt_script needs it. */
retval = bprm_change_interp(iname, bprm); retval = bprm_change_interp(iname, bprm);
if (retval < 0) if (retval < 0)
goto _error; goto error;
interp_file = open_exec (iname); interp_file = open_exec(iname);
retval = PTR_ERR (interp_file); retval = PTR_ERR(interp_file);
if (IS_ERR (interp_file)) if (IS_ERR(interp_file))
goto _error; goto error;
bprm->file = interp_file; bprm->file = interp_file;
if (fmt->flags & MISC_FMT_CREDENTIALS) { if (fmt->flags & MISC_FMT_CREDENTIALS) {
@ -218,23 +210,23 @@ static int load_misc_binary(struct linux_binprm *bprm)
memset(bprm->buf, 0, BINPRM_BUF_SIZE); memset(bprm->buf, 0, BINPRM_BUF_SIZE);
retval = kernel_read(bprm->file, 0, bprm->buf, BINPRM_BUF_SIZE); retval = kernel_read(bprm->file, 0, bprm->buf, BINPRM_BUF_SIZE);
} else } else
retval = prepare_binprm (bprm); retval = prepare_binprm(bprm);
if (retval < 0) if (retval < 0)
goto _error; goto error;
retval = search_binary_handler(bprm); retval = search_binary_handler(bprm);
if (retval < 0) if (retval < 0)
goto _error; goto error;
_ret: ret:
return retval; return retval;
_error: error:
if (fd_binary > 0) if (fd_binary > 0)
sys_close(fd_binary); sys_close(fd_binary);
bprm->interp_flags = 0; bprm->interp_flags = 0;
bprm->interp_data = 0; bprm->interp_data = 0;
goto _ret; goto ret;
} }
/* Command parsers */ /* Command parsers */
@ -261,9 +253,9 @@ static char *scanarg(char *s, char del)
return s; return s;
} }
static char * check_special_flags (char * sfs, Node * e) static char *check_special_flags(char *sfs, Node *e)
{ {
char * p = sfs; char *p = sfs;
int cont = 1; int cont = 1;
/* special flags */ /* special flags */
@ -294,6 +286,7 @@ static char * check_special_flags (char * sfs, Node * e)
return p; return p;
} }
/* /*
* This registers a new binary format, it recognises the syntax * This registers a new binary format, it recognises the syntax
* ':name:type:offset:magic:mask:interpreter:flags' * ':name:type:offset:magic:mask:interpreter:flags'
@ -323,26 +316,26 @@ static Node *create_entry(const char __user *buffer, size_t count)
memset(e, 0, sizeof(Node)); memset(e, 0, sizeof(Node));
if (copy_from_user(buf, buffer, count)) if (copy_from_user(buf, buffer, count))
goto Efault; goto efault;
del = *p++; /* delimeter */ del = *p++; /* delimeter */
pr_debug("register: delim: %#x {%c}\n", del, del); pr_debug("register: delim: %#x {%c}\n", del, del);
/* Pad the buffer with the delim to simplify parsing below. */ /* Pad the buffer with the delim to simplify parsing below. */
memset(buf+count, del, 8); memset(buf + count, del, 8);
/* Parse the 'name' field. */ /* Parse the 'name' field. */
e->name = p; e->name = p;
p = strchr(p, del); p = strchr(p, del);
if (!p) if (!p)
goto Einval; goto einval;
*p++ = '\0'; *p++ = '\0';
if (!e->name[0] || if (!e->name[0] ||
!strcmp(e->name, ".") || !strcmp(e->name, ".") ||
!strcmp(e->name, "..") || !strcmp(e->name, "..") ||
strchr(e->name, '/')) strchr(e->name, '/'))
goto Einval; goto einval;
pr_debug("register: name: {%s}\n", e->name); pr_debug("register: name: {%s}\n", e->name);
@ -357,10 +350,10 @@ static Node *create_entry(const char __user *buffer, size_t count)
e->flags = (1 << Enabled) | (1 << Magic); e->flags = (1 << Enabled) | (1 << Magic);
break; break;
default: default:
goto Einval; goto einval;
} }
if (*p++ != del) if (*p++ != del)
goto Einval; goto einval;
if (test_bit(Magic, &e->flags)) { if (test_bit(Magic, &e->flags)) {
/* Handle the 'M' (magic) format. */ /* Handle the 'M' (magic) format. */
@ -369,21 +362,21 @@ static Node *create_entry(const char __user *buffer, size_t count)
/* Parse the 'offset' field. */ /* Parse the 'offset' field. */
s = strchr(p, del); s = strchr(p, del);
if (!s) if (!s)
goto Einval; goto einval;
*s++ = '\0'; *s++ = '\0';
e->offset = simple_strtoul(p, &p, 10); e->offset = simple_strtoul(p, &p, 10);
if (*p++) if (*p++)
goto Einval; goto einval;
pr_debug("register: offset: %#x\n", e->offset); pr_debug("register: offset: %#x\n", e->offset);
/* Parse the 'magic' field. */ /* Parse the 'magic' field. */
e->magic = p; e->magic = p;
p = scanarg(p, del); p = scanarg(p, del);
if (!p) if (!p)
goto Einval; goto einval;
p[-1] = '\0'; p[-1] = '\0';
if (p == e->magic) if (p == e->magic)
goto Einval; goto einval;
if (USE_DEBUG) if (USE_DEBUG)
print_hex_dump_bytes( print_hex_dump_bytes(
KBUILD_MODNAME ": register: magic[raw]: ", KBUILD_MODNAME ": register: magic[raw]: ",
@ -393,7 +386,7 @@ static Node *create_entry(const char __user *buffer, size_t count)
e->mask = p; e->mask = p;
p = scanarg(p, del); p = scanarg(p, del);
if (!p) if (!p)
goto Einval; goto einval;
p[-1] = '\0'; p[-1] = '\0';
if (p == e->mask) { if (p == e->mask) {
e->mask = NULL; e->mask = NULL;
@ -412,9 +405,9 @@ static Node *create_entry(const char __user *buffer, size_t count)
e->size = string_unescape_inplace(e->magic, UNESCAPE_HEX); e->size = string_unescape_inplace(e->magic, UNESCAPE_HEX);
if (e->mask && if (e->mask &&
string_unescape_inplace(e->mask, UNESCAPE_HEX) != e->size) string_unescape_inplace(e->mask, UNESCAPE_HEX) != e->size)
goto Einval; goto einval;
if (e->size + e->offset > BINPRM_BUF_SIZE) if (e->size + e->offset > BINPRM_BUF_SIZE)
goto Einval; goto einval;
pr_debug("register: magic/mask length: %i\n", e->size); pr_debug("register: magic/mask length: %i\n", e->size);
if (USE_DEBUG) { if (USE_DEBUG) {
print_hex_dump_bytes( print_hex_dump_bytes(
@ -446,23 +439,23 @@ static Node *create_entry(const char __user *buffer, size_t count)
/* Skip the 'offset' field. */ /* Skip the 'offset' field. */
p = strchr(p, del); p = strchr(p, del);
if (!p) if (!p)
goto Einval; goto einval;
*p++ = '\0'; *p++ = '\0';
/* Parse the 'magic' field. */ /* Parse the 'magic' field. */
e->magic = p; e->magic = p;
p = strchr(p, del); p = strchr(p, del);
if (!p) if (!p)
goto Einval; goto einval;
*p++ = '\0'; *p++ = '\0';
if (!e->magic[0] || strchr(e->magic, '/')) if (!e->magic[0] || strchr(e->magic, '/'))
goto Einval; goto einval;
pr_debug("register: extension: {%s}\n", e->magic); pr_debug("register: extension: {%s}\n", e->magic);
/* Skip the 'mask' field. */ /* Skip the 'mask' field. */
p = strchr(p, del); p = strchr(p, del);
if (!p) if (!p)
goto Einval; goto einval;
*p++ = '\0'; *p++ = '\0';
} }
@ -470,27 +463,28 @@ static Node *create_entry(const char __user *buffer, size_t count)
e->interpreter = p; e->interpreter = p;
p = strchr(p, del); p = strchr(p, del);
if (!p) if (!p)
goto Einval; goto einval;
*p++ = '\0'; *p++ = '\0';
if (!e->interpreter[0]) if (!e->interpreter[0])
goto Einval; goto einval;
pr_debug("register: interpreter: {%s}\n", e->interpreter); pr_debug("register: interpreter: {%s}\n", e->interpreter);
/* Parse the 'flags' field. */ /* Parse the 'flags' field. */
p = check_special_flags (p, e); p = check_special_flags(p, e);
if (*p == '\n') if (*p == '\n')
p++; p++;
if (p != buf + count) if (p != buf + count)
goto Einval; goto einval;
return e; return e;
out: out:
return ERR_PTR(err); return ERR_PTR(err);
Efault: efault:
kfree(e); kfree(e);
return ERR_PTR(-EFAULT); return ERR_PTR(-EFAULT);
Einval: einval:
kfree(e); kfree(e);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
@ -509,7 +503,7 @@ static int parse_command(const char __user *buffer, size_t count)
return -EFAULT; return -EFAULT;
if (!count) if (!count)
return 0; return 0;
if (s[count-1] == '\n') if (s[count - 1] == '\n')
count--; count--;
if (count == 1 && s[0] == '0') if (count == 1 && s[0] == '0')
return 1; return 1;
@ -526,7 +520,7 @@ static void entry_status(Node *e, char *page)
{ {
char *dp; char *dp;
char *status = "disabled"; char *status = "disabled";
const char * flags = "flags: "; const char *flags = "flags: ";
if (test_bit(Enabled, &e->flags)) if (test_bit(Enabled, &e->flags))
status = "enabled"; status = "enabled";
@ -540,19 +534,15 @@ static void entry_status(Node *e, char *page)
dp = page + strlen(page); dp = page + strlen(page);
/* print the special flags */ /* print the special flags */
sprintf (dp, "%s", flags); sprintf(dp, "%s", flags);
dp += strlen (flags); dp += strlen(flags);
if (e->flags & MISC_FMT_PRESERVE_ARGV0) { if (e->flags & MISC_FMT_PRESERVE_ARGV0)
*dp ++ = 'P'; *dp++ = 'P';
} if (e->flags & MISC_FMT_OPEN_BINARY)
if (e->flags & MISC_FMT_OPEN_BINARY) { *dp++ = 'O';
*dp ++ = 'O'; if (e->flags & MISC_FMT_CREDENTIALS)
} *dp++ = 'C';
if (e->flags & MISC_FMT_CREDENTIALS) { *dp++ = '\n';
*dp ++ = 'C';
}
*dp ++ = '\n';
if (!test_bit(Magic, &e->flags)) { if (!test_bit(Magic, &e->flags)) {
sprintf(dp, "extension .%s\n", e->magic); sprintf(dp, "extension .%s\n", e->magic);
@ -580,7 +570,7 @@ static void entry_status(Node *e, char *page)
static struct inode *bm_get_inode(struct super_block *sb, int mode) static struct inode *bm_get_inode(struct super_block *sb, int mode)
{ {
struct inode * inode = new_inode(sb); struct inode *inode = new_inode(sb);
if (inode) { if (inode) {
inode->i_ino = get_next_ino(); inode->i_ino = get_next_ino();
@ -620,13 +610,14 @@ static void kill_node(Node *e)
/* /<entry> */ /* /<entry> */
static ssize_t static ssize_t
bm_entry_read(struct file * file, char __user * buf, size_t nbytes, loff_t *ppos) bm_entry_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
{ {
Node *e = file_inode(file)->i_private; Node *e = file_inode(file)->i_private;
ssize_t res; ssize_t res;
char *page; char *page;
if (!(page = (char*) __get_free_page(GFP_KERNEL))) page = (char *) __get_free_page(GFP_KERNEL);
if (!page)
return -ENOMEM; return -ENOMEM;
entry_status(e, page); entry_status(e, page);
@ -663,8 +654,10 @@ static ssize_t bm_entry_write(struct file *file, const char __user *buffer,
mutex_unlock(&root->d_inode->i_mutex); mutex_unlock(&root->d_inode->i_mutex);
dput(root); dput(root);
break; break;
default: return res; default:
return res;
} }
return count; return count;
} }
@ -752,7 +745,7 @@ bm_status_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
return simple_read_from_buffer(buf, nbytes, ppos, s, strlen(s)); return simple_read_from_buffer(buf, nbytes, ppos, s, strlen(s));
} }
static ssize_t bm_status_write(struct file * file, const char __user * buffer, static ssize_t bm_status_write(struct file *file, const char __user *buffer,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
int res = parse_command(buffer, count); int res = parse_command(buffer, count);
@ -778,8 +771,10 @@ static ssize_t bm_status_write(struct file * file, const char __user * buffer,
mutex_unlock(&root->d_inode->i_mutex); mutex_unlock(&root->d_inode->i_mutex);
dput(root); dput(root);
break; break;
default: return res; default:
return res;
} }
return count; return count;
} }
@ -796,14 +791,16 @@ static const struct super_operations s_ops = {
.evict_inode = bm_evict_inode, .evict_inode = bm_evict_inode,
}; };
static int bm_fill_super(struct super_block * sb, void * data, int silent) static int bm_fill_super(struct super_block *sb, void *data, int silent)
{ {
int err;
static struct tree_descr bm_files[] = { static struct tree_descr bm_files[] = {
[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
[3] = {"register", &bm_register_operations, S_IWUSR}, [3] = {"register", &bm_register_operations, S_IWUSR},
/* last one */ {""} /* last one */ {""}
}; };
int err = simple_fill_super(sb, BINFMTFS_MAGIC, bm_files);
err = simple_fill_super(sb, BINFMTFS_MAGIC, bm_files);
if (!err) if (!err)
sb->s_op = &s_ops; sb->s_op = &s_ops;
return err; return err;