Skip to content

Commit c4bf3cf

Browse files
pvts-matPlaidCat
authored andcommitted
mm: kmem: fix a NULL pointer dereference in obj_stock_flush_required()
jira VULN-155863 cve CVE-2023-53401 commit-author Roman Gushchin <roman.gushchin@linux.dev> commit 3b8abb3 upstream-diff Resolved context conflicts only, no actual diff from the upstream KCSAN found an issue in obj_stock_flush_required(): stock->cached_objcg can be reset between the check and dereference: ================================================================== BUG: KCSAN: data-race in drain_all_stock / drain_obj_stock write to 0xffff888237c2a2f8 of 8 bytes by task 19625 on cpu 0: drain_obj_stock+0x408/0x4e0 mm/memcontrol.c:3306 refill_obj_stock+0x9c/0x1e0 mm/memcontrol.c:3340 obj_cgroup_uncharge+0xe/0x10 mm/memcontrol.c:3408 memcg_slab_free_hook mm/slab.h:587 [inline] __cache_free mm/slab.c:3373 [inline] __do_kmem_cache_free mm/slab.c:3577 [inline] kmem_cache_free+0x105/0x280 mm/slab.c:3602 __d_free fs/dcache.c:298 [inline] dentry_free fs/dcache.c:375 [inline] __dentry_kill+0x422/0x4a0 fs/dcache.c:621 dentry_kill+0x8d/0x1e0 dput+0x118/0x1f0 fs/dcache.c:913 __fput+0x3bf/0x570 fs/file_table.c:329 ____fput+0x15/0x20 fs/file_table.c:349 task_work_run+0x123/0x160 kernel/task_work.c:179 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop+0xcf/0xe0 kernel/entry/common.c:171 exit_to_user_mode_prepare+0x6a/0xa0 kernel/entry/common.c:203 __syscall_exit_to_user_mode_work kernel/entry/common.c:285 [inline] syscall_exit_to_user_mode+0x26/0x140 kernel/entry/common.c:296 do_syscall_64+0x4d/0xc0 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x63/0xcd read to 0xffff888237c2a2f8 of 8 bytes by task 19632 on cpu 1: obj_stock_flush_required mm/memcontrol.c:3319 [inline] drain_all_stock+0x174/0x2a0 mm/memcontrol.c:2361 try_charge_memcg+0x6d0/0xd10 mm/memcontrol.c:2703 try_charge mm/memcontrol.c:2837 [inline] mem_cgroup_charge_skmem+0x51/0x140 mm/memcontrol.c:7290 sock_reserve_memory+0xb1/0x390 net/core/sock.c:1025 sk_setsockopt+0x800/0x1e70 net/core/sock.c:1525 udp_lib_setsockopt+0x99/0x6c0 net/ipv4/udp.c:2692 udp_setsockopt+0x73/0xa0 net/ipv4/udp.c:2817 sock_common_setsockopt+0x61/0x70 net/core/sock.c:3668 __sys_setsockopt+0x1c3/0x230 net/socket.c:2271 __do_sys_setsockopt net/socket.c:2282 [inline] __se_sys_setsockopt net/socket.c:2279 [inline] __x64_sys_setsockopt+0x66/0x80 net/socket.c:2279 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd value changed: 0xffff8881382d52c0 -> 0xffff888138893740 Reported by Kernel Concurrency Sanitizer on: CPU: 1 PID: 19632 Comm: syz-executor.0 Not tainted 6.3.0-rc2-syzkaller-00387-g534293368afa #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/02/2023 Fix it by using READ_ONCE()/WRITE_ONCE() for all accesses to stock->cached_objcg. Link: https://lkml.kernel.org/r/20230502160839.361544-1-roman.gushchin@linux.dev Fixes: bf4f059 ("mm: memcg/slab: obj_cgroup API") Signed-off-by: Roman Gushchin <roman.gushchin@linux.dev> Reported-by: syzbot+774c29891415ab0fd29d@syzkaller.appspotmail.com Reported-by: Dmitry Vyukov <dvyukov@google.com> Link: https://lore.kernel.org/linux-mm/CACT4Y+ZfucZhM60YPphWiCLJr6+SGFhT+jjm8k1P-a_8Kkxsjg@mail.gmail.com/T/#t Reviewed-by: Yosry Ahmed <yosryahmed@google.com> Acked-by: Shakeel Butt <shakeelb@google.com> Reviewed-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> (cherry picked from commit 3b8abb3) Signed-off-by: Marcin Wcisło <marcin.wcislo@conclusive.pl>
1 parent 0b0e898 commit c4bf3cf

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

mm/memcontrol.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3095,12 +3095,12 @@ void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *pgdat,
30953095
* accumulating over a page of vmstat data or when pgdat or idx
30963096
* changes.
30973097
*/
3098-
if (stock->cached_objcg != objcg) {
3098+
if (READ_ONCE(stock->cached_objcg) != objcg) {
30993099
drain_obj_stock(stock);
31003100
obj_cgroup_get(objcg);
31013101
stock->nr_bytes = atomic_read(&objcg->nr_charged_bytes)
31023102
? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0;
3103-
stock->cached_objcg = objcg;
3103+
WRITE_ONCE(stock->cached_objcg, objcg);
31043104
stock->cached_pgdat = pgdat;
31053105
} else if (stock->cached_pgdat != pgdat) {
31063106
/* Flush the existing cached vmstat data */
@@ -3152,7 +3152,7 @@ static bool consume_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes)
31523152
local_irq_save(flags);
31533153

31543154
stock = this_cpu_ptr(&memcg_stock);
3155-
if (objcg == stock->cached_objcg && stock->nr_bytes >= nr_bytes) {
3155+
if (objcg == READ_ONCE(stock->cached_objcg) && stock->nr_bytes >= nr_bytes) {
31563156
stock->nr_bytes -= nr_bytes;
31573157
ret = true;
31583158
}
@@ -3164,7 +3164,7 @@ static bool consume_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes)
31643164

31653165
static void drain_obj_stock(struct memcg_stock_pcp *stock)
31663166
{
3167-
struct obj_cgroup *old = stock->cached_objcg;
3167+
struct obj_cgroup *old = READ_ONCE(stock->cached_objcg);
31683168

31693169
if (!old)
31703170
return;
@@ -3210,16 +3210,17 @@ static void drain_obj_stock(struct memcg_stock_pcp *stock)
32103210
}
32113211

32123212
obj_cgroup_put(old);
3213-
stock->cached_objcg = NULL;
3213+
WRITE_ONCE(stock->cached_objcg, NULL);
32143214
}
32153215

32163216
static bool obj_stock_flush_required(struct memcg_stock_pcp *stock,
32173217
struct mem_cgroup *root_memcg)
32183218
{
3219+
struct obj_cgroup *objcg = READ_ONCE(stock->cached_objcg);
32193220
struct mem_cgroup *memcg;
32203221

3221-
if (stock->cached_objcg) {
3222-
memcg = obj_cgroup_memcg(stock->cached_objcg);
3222+
if (objcg) {
3223+
memcg = obj_cgroup_memcg(objcg);
32233224
if (memcg && mem_cgroup_is_descendant(memcg, root_memcg))
32243225
return true;
32253226
}
@@ -3237,10 +3238,10 @@ static void refill_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes,
32373238
local_irq_save(flags);
32383239

32393240
stock = this_cpu_ptr(&memcg_stock);
3240-
if (stock->cached_objcg != objcg) { /* reset if necessary */
3241+
if (READ_ONCE(stock->cached_objcg) != objcg) { /* reset if necessary */
32413242
drain_obj_stock(stock);
32423243
obj_cgroup_get(objcg);
3243-
stock->cached_objcg = objcg;
3244+
WRITE_ONCE(stock->cached_objcg, objcg);
32443245
stock->nr_bytes = atomic_read(&objcg->nr_charged_bytes)
32453246
? atomic_xchg(&objcg->nr_charged_bytes, 0) : 0;
32463247
allow_uncharge = true; /* Allow uncharge when objcg changes */

0 commit comments

Comments
 (0)