From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Morris <jmorris@namei.org>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Petko Manolov <petkan@mip-labs.com>,
Mimi Zohar <zohar@linux.vnet.ibm.com>
Subject: linux-next: manual merge of the security tree with the vfs tree
Date: Thu, 31 Dec 2015 15:24:53 +1100 [thread overview]
Message-ID: <20151231152453.08cfae79@canb.auug.org.au> (raw)
Hi James,
Today's linux-next merge of the security tree got a conflict in:
security/integrity/ima/ima_fs.c
between commit:
3bc8f29b149e ("new helper: memdup_user_nul()")
from the vfs tree and commit:
38d859f991f3 ("IMA: policy can now be updated multiple times")
from the security tree.
I fixed it up (hopefully, see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc security/integrity/ima/ima_fs.c
index 71aa60b8d257,3caed6de610c..000000000000
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@@ -259,21 -261,35 +261,30 @@@ static const struct file_operations ima
static ssize_t ima_write_policy(struct file *file, const char __user *buf,
size_t datalen, loff_t *ppos)
{
- char *data = NULL;
ssize_t result;
- char *data;
++ char *data = NULL;
+ int res;
+
+ res = mutex_lock_interruptible(&ima_write_mutex);
+ if (res)
+ return res;
if (datalen >= PAGE_SIZE)
datalen = PAGE_SIZE - 1;
/* No partial writes. */
+ result = -EINVAL;
if (*ppos != 0)
- return -EINVAL;
+ goto out;
- result = -ENOMEM;
- data = kmalloc(datalen + 1, GFP_KERNEL);
- if (!data)
- goto out;
-
- *(data + datalen) = '\0';
-
- result = -EFAULT;
- if (copy_from_user(data, buf, datalen))
+ data = memdup_user_nul(buf, datalen);
- if (IS_ERR(data))
- return PTR_ERR(data);
++ if (IS_ERR(data)) {
++ result = PTR_ERR(data);
+ goto out;
++ }
result = ima_parse_add_rule(data);
+ out:
if (result < 0)
valid_policy = 0;
kfree(data);
next reply other threads:[~2015-12-31 4:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 4:24 Stephen Rothwell [this message]
2015-12-31 4:30 ` linux-next: manual merge of the security tree with the vfs tree Al Viro
2015-12-31 10:45 ` Petko Manolov
2016-01-01 4:34 ` Al Viro
2016-01-01 17:29 ` Petko Manolov
2016-01-01 17:41 ` [PATCH] ima_write_policy() optimizations; kbuild test robot
2016-01-04 1:37 ` linux-next: manual merge of the security tree with the vfs tree Mimi Zohar
2016-01-04 1:55 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-08-12 4:44 Stephen Rothwell
2015-05-13 4:39 Stephen Rothwell
2015-05-13 4:26 Stephen Rothwell
2014-12-10 2:47 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151231152453.08cfae79@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=petkan@mip-labs.com \
--cc=viro@ZenIV.linux.org.uk \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).