| Message ID | 20231020234058.2232347-1-anjali.k.kulkarni@oracle.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9644bc49705723bf7c69aa9bf542bb5161b91dba |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] Fix NULL pointer dereference in cn_filter() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to netdev/net.git (main) by Paolo Abeni <pabeni@redhat.com>: 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 <oliver.sang@intel.com> > Closes: https://lore.kernel.org/oe-lkp/202309201456.84c19e27-oliver.sang@intel.com/ > Signed-off-by: Anjali Kulkarni <anjali.k.kulkarni@oracle.com> > > [...] 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!
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;
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 <oliver.sang@intel.com> Closes: https://lore.kernel.org/oe-lkp/202309201456.84c19e27-oliver.sang@intel.com/ Signed-off-by: Anjali Kulkarni <anjali.k.kulkarni@oracle.com> --- drivers/connector/cn_proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)