[PATCH] gve: fix for null pointer dereference.

Subsystems: networking drivers, the rest

STALE1773d

3 messages, 2 authors, 2021-12-08 · open the first message on its own page

[PATCH] gve: fix for null pointer dereference.

From: Ameer Hamza <hidden>
Date: 2021-12-05 18:33:46

Avoid passing NULL skb to __skb_put() function call if
napi_alloc_skb() returns NULL.

Addresses-Coverity: 1494144 (Dereference NULL return value)

Signed-off-by: Ameer Hamza <redacted>
---
 drivers/net/ethernet/google/gve/gve_utils.c | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/google/gve/gve_utils.c b/drivers/net/ethernet/google/gve/gve_utils.c
index 88ca49cbc1e2..f4befdb54ad4 100644
--- a/drivers/net/ethernet/google/gve/gve_utils.c
+++ b/drivers/net/ethernet/google/gve/gve_utils.c
@@ -68,6 +68,9 @@ struct sk_buff *gve_rx_copy(struct net_device *dev, struct napi_struct *napi,
 		set_protocol = ctx->curr_frag_cnt == ctx->expected_frag_cnt - 1;
 	} else {
 		skb = napi_alloc_skb(napi, len);
+
+		if (unlikely(!ctx->skb_head))
+			return NULL;
 		set_protocol = true;
 	}
 	__skb_put(skb, len);
-- 
2.25.1

[PATCH v2] gve: fix for null pointer dereference.

From: Ameer Hamza <hidden>
Date: 2021-12-05 18:38:21

Avoid passing NULL skb to __skb_put() function call if
napi_alloc_skb() returns NULL.

Addresses-Coverity: 1494144 (Dereference NULL return value)

Signed-off-by: Ameer Hamza <redacted>

---
Change in v2:
checking for correct skb pointer for NULL check
---
 drivers/net/ethernet/google/gve/gve_utils.c | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/google/gve/gve_utils.c b/drivers/net/ethernet/google/gve/gve_utils.c
index 88ca49cbc1e2..d57508bc4307 100644
--- a/drivers/net/ethernet/google/gve/gve_utils.c
+++ b/drivers/net/ethernet/google/gve/gve_utils.c
@@ -68,6 +68,9 @@ struct sk_buff *gve_rx_copy(struct net_device *dev, struct napi_struct *napi,
 		set_protocol = ctx->curr_frag_cnt == ctx->expected_frag_cnt - 1;
 	} else {
 		skb = napi_alloc_skb(napi, len);
+
+		if (unlikely(!skb))
+			return NULL;
 		set_protocol = true;
 	}
 	__skb_put(skb, len);
-- 
2.25.1

Re: [PATCH v2] gve: fix for null pointer dereference.

From: patchwork-bot+netdevbpf@kernel.org
Date: 2021-12-08 05:10:15

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski [off-list ref]:

On Sun,  5 Dec 2021 23:38:10 +0500 you wrote:
Avoid passing NULL skb to __skb_put() function call if
napi_alloc_skb() returns NULL.

Addresses-Coverity: 1494144 (Dereference NULL return value)

Signed-off-by: Ameer Hamza <redacted>

[...]
Here is the summary with links:
  - [v2] gve: fix for null pointer dereference.
    https://git.kernel.org/netdev/net/c/e6f60c51f043

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

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help