summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Cline <jeremy@jcline.org>2023-09-08 19:58:53 -0400
committerJakub Kicinski <kuba@kernel.org>2023-10-03 07:39:31 -0700
commitdfc7f7a988dad34c3bf4c053124fb26aa6c5f916 (patch)
tree03403220b05dcdc472d30d6f4279b47dbc0f9096
parent8957261cd8149ed9d0738c01c0320bcbff989407 (diff)
net: nfc: llcp: Add lock when modifying device list
The device list needs its associated lock held when modifying it, or the list could become corrupted, as syzbot discovered. Reported-and-tested-by: syzbot+c1d0a03d305972dbbe14@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=c1d0a03d305972dbbe14 Signed-off-by: Jeremy Cline <jeremy@jcline.org> Reviewed-by: Simon Horman <horms@kernel.org> Fixes: 6709d4b7bc2e ("net: nfc: Fix use-after-free caused by nfc_llcp_find_local") Link: https://lore.kernel.org/r/20230908235853.1319596-1-jeremy@jcline.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--net/nfc/llcp_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index f60e424e0607..6705bb895e23 100644
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c
@@ -1636,7 +1636,9 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
timer_setup(&local->sdreq_timer, nfc_llcp_sdreq_timer, 0);
INIT_WORK(&local->sdreq_timeout_work, nfc_llcp_sdreq_timeout_work);
+ spin_lock(&llcp_devices_lock);
list_add(&local->list, &llcp_devices);
+ spin_unlock(&llcp_devices_lock);
return 0;
}