Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 09:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

apparmor: remove unused op parameter from simple_write_to_buffer()

Browse Source 
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2017-01-16 00:43:03 -08:00
parent ef88a7ac55
commit 5ef50d014c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
security/apparmor/apparmorfs.c
View File

@ -76,7 +76,6 @@ static int mangle_name(const char *name, char *target)
/** /**
* aa_simple_write_to_buffer - common routine for getting policy from user * aa_simple_write_to_buffer - common routine for getting policy from user
* @op: operation doing the user buffer copy
* @userbuf: user buffer to copy data from (NOT NULL) * @userbuf: user buffer to copy data from (NOT NULL)
* @alloc_size: size of user buffer (REQUIRES: @alloc_size >= @copy_size) * @alloc_size: size of user buffer (REQUIRES: @alloc_size >= @copy_size)
* @copy_size: size of data to copy from user buffer * @copy_size: size of data to copy from user buffer
@ -85,8 +84,7 @@ static int mangle_name(const char *name, char *target)
* Returns: kernel buffer containing copy of user buffer data or an * Returns: kernel buffer containing copy of user buffer data or an
* ERR_PTR on failure. * ERR_PTR on failure.
*/ */
static struct aa_loaddata *aa_simple_write_to_buffer(const char *op, static struct aa_loaddata *aa_simple_write_to_buffer(const char __user *userbuf,
const char __user *userbuf,
size_t alloc_size, size_t alloc_size,
size_t copy_size, size_t copy_size,
loff_t *pos) loff_t *pos)
@ -130,7 +128,7 @@ static ssize_t policy_update(int binop, const char __user *buf, size_t size,
if (error) if (error)
return error; return error;
data = aa_simple_write_to_buffer(op, buf, size, size, pos); data = aa_simple_write_to_buffer(buf, size, size, pos);
error = PTR_ERR(data); error = PTR_ERR(data);
if (!IS_ERR(data)) { if (!IS_ERR(data)) {
error = aa_replace_profiles(ns ? ns : profile->ns, profile, error = aa_replace_profiles(ns ? ns : profile->ns, profile,
@ -196,8 +194,7 @@ static ssize_t profile_remove(struct file *f, const char __user *buf,
* aa_remove_profile needs a null terminated string so 1 extra * aa_remove_profile needs a null terminated string so 1 extra
* byte is allocated and the copied data is null terminated. * byte is allocated and the copied data is null terminated.
*/ */
data = aa_simple_write_to_buffer(OP_PROF_RM, buf, size + 1, size, data = aa_simple_write_to_buffer(buf, size + 1, size, pos);
pos);
error = PTR_ERR(data); error = PTR_ERR(data);
if (!IS_ERR(data)) { if (!IS_ERR(data)) {