xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysctl: Fix data races in proc_dointvec().

Browse Source 
[ Upstream commit 1f1be04b4d48a2475ea1aab46a99221bfc5c0968 ]

A sysctl variable is accessed concurrently, and there is always a chance
of data-race.  So, all readers and writers need some basic protection to
avoid load/store-tearing.

This patch changes proc_dointvec() to use READ_ONCE() and WRITE_ONCE()
internally to fix data-races on the sysctl side.  For now, proc_dointvec()
itself is tolerant to a data-race, but we still need to add annotations on
the other subsystem's side.

Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Kuniyuki Iwashima
2022-07-06 16:39:52 -07:00
committed by Greg Kroah-Hartman
parent 9cc8edc571
commit 80cc28a4b4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/sysctl.c
View File

@@ -557,14 +557,14 @@ static int do_proc_dointvec_conv(bool *negp, unsigned long *lvalp,
if (*negp) { if (*negp) {
if (*lvalp > (unsigned long) INT_MAX + 1) if (*lvalp > (unsigned long) INT_MAX + 1)
return -EINVAL; return -EINVAL;
*valp = -*lvalp; WRITE_ONCE(*valp, -*lvalp);
} else { } else {
if (*lvalp > (unsigned long) INT_MAX) if (*lvalp > (unsigned long) INT_MAX)
return -EINVAL; return -EINVAL;
*valp = *lvalp; WRITE_ONCE(*valp, *lvalp);
} }
} else { } else {
int val = *valp; int val = READ_ONCE(*valp);
if (val < 0) { if (val < 0) {
*negp = true; *negp = true;
*lvalp = -(unsigned long)val; *lvalp = -(unsigned long)val;