2023-10-20 23:41:21

by Anjali Kulkarni

Subject: [PATCH v2] Fix NULL pointer dereference in cn_filter()

Check that sk_user_data is not NULL, else return from cn_filter().
Could not reproduce this issue, but Oliver Sang verified it has fixed
the "Closes" problem below.

Fixes: 2aa1f7a1f47c ("connector/cn_proc: Add filtering to fix some bugs")
Reported-by: kernel test robot <[email protected]>
Closes: https://lore.kernel.org/oe-lkp/[email protected]/
Signed-off-by: Anjali Kulkarni <[email protected]>
---
drivers/connector/cn_proc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 05d562e9c8b1..44b19e696176 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -54,7 +54,7 @@ static int cn_filter(struct sock *dsk, struct sk_buff *skb, void *data)
enum proc_cn_mcast_op mc_op;
uintptr_t val;

- if (!dsk || !data)
+ if (!dsk || !dsk->sk_user_data || !data)
return 0;

ptr = (__u32 *)data;
--
2.42.0

2023-10-24 09:20:43

by patchwork-bot+netdevbpf

Subject: Re: [PATCH v2] Fix NULL pointer dereference in cn_filter()

Hello:

This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:

On Fri, 20 Oct 2023 16:40:58 -0700 you wrote:
> Check that sk_user_data is not NULL, else return from cn_filter().
> Could not reproduce this issue, but Oliver Sang verified it has fixed
> the "Closes" problem below.
>
> Fixes: 2aa1f7a1f47c ("connector/cn_proc: Add filtering to fix some bugs")
> Reported-by: kernel test robot <[email protected]>
> Closes: https://lore.kernel.org/oe-lkp/[email protected]/
> Signed-off-by: Anjali Kulkarni <[email protected]>
>
> [...]

Here is the summary with links:
- [v2] Fix NULL pointer dereference in cn_filter()
https://git.kernel.org/netdev/net/c/9644bc497057

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