diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2017-05-13 18:12:07 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-05-25 23:28:36 -0400 |
commit | 0b884d25f5212bd0323d179c570962bbf822e330 (patch) | |
tree | cb03f328b079e28c0333c3a099e2e9e6bdc1fb0e /security | |
parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
download | linux-stable-0b884d25f5212bd0323d179c570962bbf822e330.tar.gz linux-stable-0b884d25f5212bd0323d179c570962bbf822e330.tar.bz2 linux-stable-0b884d25f5212bd0323d179c570962bbf822e330.zip |
sel_write_validatetrans(): don't open-code memdup_user_nul()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/selinuxfs.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 50062e70140d..0940892de84d 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -656,14 +656,12 @@ static ssize_t sel_write_validatetrans(struct file *file, if (*ppos != 0) goto out; - rc = -ENOMEM; - req = kzalloc(count + 1, GFP_KERNEL); - if (!req) - goto out; - - rc = -EFAULT; - if (copy_from_user(req, buf, count)) + req = memdup_user_nul(buf, count); + if (IS_ERR(req)) { + rc = PTR_ERR(req); + req = NULL; goto out; + } rc = -ENOMEM; oldcon = kzalloc(count + 1, GFP_KERNEL); |