diff options
| author | Zheng Yejian <zhengyejian1@huawei.com> | 2021-05-15 22:06:31 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-07 12:07:31 +0100 |
| commit | e93f995a591c352d35d89c518c54f790e1537754 (patch) | |
| tree | e37d1bb9ae149af44f131defdc92eb9d0948057f | |
| parent | 6b0ea3df56cccd53398d0289f399f19d43136b2e (diff) | |
| download | linux-stable-e93f995a591c352d35d89c518c54f790e1537754.tar.gz linux-stable-e93f995a591c352d35d89c518c54f790e1537754.tar.bz2 linux-stable-e93f995a591c352d35d89c518c54f790e1537754.zip | |
acct: fix potential integer overflow in encode_comp_t()
[ Upstream commit c5f31c655bcc01b6da53b836ac951c1556245305 ]
The integer overflow is descripted with following codes:
> 317 static comp_t encode_comp_t(u64 value)
> 318 {
> 319 int exp, rnd;
......
> 341 exp <<= MANTSIZE;
> 342 exp += value;
> 343 return exp;
> 344 }
Currently comp_t is defined as type of '__u16', but the variable 'exp' is
type of 'int', so overflow would happen when variable 'exp' in line 343 is
greater than 65535.
Link: https://lkml.kernel.org/r/20210515140631.369106-3-zhengyejian1@huawei.com
Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
Cc: Hanjun Guo <guohanjun@huawei.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Zhang Jinhao <zhangjinhao2@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | kernel/acct.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index 37f1dc696fbd..928ed84f50df 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -328,6 +328,8 @@ static comp_t encode_comp_t(unsigned long value) exp++; } + if (exp > (((comp_t) ~0U) >> MANTSIZE)) + return (comp_t) ~0U; /* * Clean it up and polish it off. */ |