diff options
| author | Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> | 2021-04-12 22:45:50 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-19 08:53:18 +0200 |
| commit | 135122f174c357b7a3e58f40fa5792156c5e93e6 (patch) | |
| tree | e5fc82c6afea60bfca570605b1613d24bbf7119b /security | |
| parent | a21e5cb1a64c904f1f0ef7b2d386fc7d2b1d2ce2 (diff) | |
| download | linux-stable-135122f174c357b7a3e58f40fa5792156c5e93e6.tar.gz linux-stable-135122f174c357b7a3e58f40fa5792156c5e93e6.tar.bz2 linux-stable-135122f174c357b7a3e58f40fa5792156c5e93e6.zip | |
smackfs: restrict bytes count in smk_set_cipso()
commit 49ec114a6e62d8d320037ce71c1aaf9650b3cafd upstream.
Oops, I failed to update subject line.
From 07571157c91b98ce1a4aa70967531e64b78e8346 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Mon, 12 Apr 2021 22:25:06 +0900
Subject: smackfs: restrict bytes count in smk_set_cipso()
Commit 7ef4c19d245f3dc2 ("smackfs: restrict bytes count in smackfs write
functions") missed that count > SMK_CIPSOMAX check applies to only
format == SMK_FIXED24_FMT case.
Reported-by: syzbot <syzbot+77c53db50c9fff774e8e@syzkaller.appspotmail.com>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/smack/smackfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 5e75ff2e1b14..3823ab2c4e4b 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -855,6 +855,8 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, if (format == SMK_FIXED24_FMT && (count < SMK_CIPSOMIN || count > SMK_CIPSOMAX)) return -EINVAL; + if (count > PAGE_SIZE) + return -EINVAL; data = memdup_user_nul(buf, count); if (IS_ERR(data)) |