netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 net] net: nfc: llcp: Add lock when modifying device list
@ 2023-09-25 19:23 Jeremy Cline
  2023-09-30 13:19 ` Simon Horman
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Jeremy Cline @ 2023-09-25 19:23 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
	Lin Ma, Simon Horman, netdev, linux-kernel, Jeremy Cline,
	syzbot+c1d0a03d305972dbbe14

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
Fixes: 6709d4b7bc2e ("net: nfc: Fix use-after-free caused by nfc_llcp_find_local")
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
---
Changes from v1: added the correct Fixes tag

 net/nfc/llcp_core.c | 2 ++
 1 file changed, 2 insertions(+)

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;
 }
-- 
2.41.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2 net] net: nfc: llcp: Add lock when modifying device list
  2023-09-25 19:23 [PATCH v2 net] net: nfc: llcp: Add lock when modifying device list Jeremy Cline
@ 2023-09-30 13:19 ` Simon Horman
  2023-10-03  8:01 ` Krzysztof Kozlowski
  2023-10-03 15:40 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2023-09-30 13:19 UTC (permalink / raw)
  To: Jeremy Cline
  Cc: Krzysztof Kozlowski, David S . Miller, Eric Dumazet,
	Jakub Kicinski, Paolo Abeni, Lin Ma, netdev, linux-kernel,
	syzbot+c1d0a03d305972dbbe14

On Mon, Sep 25, 2023 at 03:23:51PM -0400, Jeremy Cline wrote:
> 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
> Fixes: 6709d4b7bc2e ("net: nfc: Fix use-after-free caused by nfc_llcp_find_local")
> Signed-off-by: Jeremy Cline <jeremy@jcline.org>

Reviewed-by: Simon Horman <horms@kernel.org>


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2 net] net: nfc: llcp: Add lock when modifying device list
  2023-09-25 19:23 [PATCH v2 net] net: nfc: llcp: Add lock when modifying device list Jeremy Cline
  2023-09-30 13:19 ` Simon Horman
@ 2023-10-03  8:01 ` Krzysztof Kozlowski
  2023-10-03 15:40 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2023-10-03  8:01 UTC (permalink / raw)
  To: Jeremy Cline
  Cc: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
	Lin Ma, Simon Horman, netdev, linux-kernel,
	syzbot+c1d0a03d305972dbbe14

On 25/09/2023 21:23, Jeremy Cline wrote:
> 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
> Fixes: 6709d4b7bc2e ("net: nfc: Fix use-after-free caused by nfc_llcp_find_local")
> Signed-off-by: Jeremy Cline <jeremy@jcline.org>
> ---


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2 net] net: nfc: llcp: Add lock when modifying device list
  2023-09-25 19:23 [PATCH v2 net] net: nfc: llcp: Add lock when modifying device list Jeremy Cline
  2023-09-30 13:19 ` Simon Horman
  2023-10-03  8:01 ` Krzysztof Kozlowski
@ 2023-10-03 15:40 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-10-03 15:40 UTC (permalink / raw)
  To: Jeremy Cline
  Cc: krzysztof.kozlowski, davem, edumazet, kuba, pabeni, linma, horms,
	netdev, linux-kernel, syzbot+c1d0a03d305972dbbe14

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 25 Sep 2023 15:23:51 -0400 you wrote:
> 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
> Fixes: 6709d4b7bc2e ("net: nfc: Fix use-after-free caused by nfc_llcp_find_local")
> Signed-off-by: Jeremy Cline <jeremy@jcline.org>
> 
> [...]

Here is the summary with links:
  - [v2,net] net: nfc: llcp: Add lock when modifying device list
    https://git.kernel.org/netdev/net/c/dfc7f7a988da

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-10-03 15:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-25 19:23 [PATCH v2 net] net: nfc: llcp: Add lock when modifying device list Jeremy Cline
2023-09-30 13:19 ` Simon Horman
2023-10-03  8:01 ` Krzysztof Kozlowski
2023-10-03 15:40 ` patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).