diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2020-07-23 18:22:19 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-19 08:14:59 +0200 |
commit | 820defebf4ead19c96ecc36a16dba85f315c0931 (patch) | |
tree | ca7dd97d55bad2b03f8bebbc8a8a950adf2b4250 /security | |
parent | b6be0b71eaaa2eb71d87d29f2775c74a36d320ad (diff) | |
download | linux-stable-820defebf4ead19c96ecc36a16dba85f315c0931.tar.gz linux-stable-820defebf4ead19c96ecc36a16dba85f315c0931.tar.bz2 linux-stable-820defebf4ead19c96ecc36a16dba85f315c0931.zip |
Smack: fix another vsscanf out of bounds
[ Upstream commit a6bd4f6d9b07452b0b19842044a6c3ea384b0b88 ]
This is similar to commit 84e99e58e8d1 ("Smack: slab-out-of-bounds in
vsscanf") where we added a bounds check on "rule".
Reported-by: syzbot+a22c6092d003d6fe1122@syzkaller.appspotmail.com
Fixes: f7112e6c9abf ("Smack: allow for significantly longer Smack labels v4")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/smack/smackfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 10ee51d04492..981f582539ac 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -933,6 +933,10 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, for (i = 0; i < catlen; i++) { rule += SMK_DIGITLEN; + if (rule > data + count) { + rc = -EOVERFLOW; + goto out; + } ret = sscanf(rule, "%u", &cat); if (ret != 1 || cat > SMACK_CIPSO_MAXCATNUM) goto out; |