[PATCH] revert "net: kcm: fix memory leak in kcm_sendmsg"

Subsystems: networking [general], the rest

STALE1938d

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

[PATCH] revert "net: kcm: fix memory leak in kcm_sendmsg"

From: Pavel Skripkin <hidden>
Date: 2021-06-07 17:20:36

In commit c47cc304990a ("net: kcm: fix memory leak in kcm_sendmsg")
I misunderstand the root case of memory leak and came up
completely broken fix.

So, simply revert this commit to avoid GPF.

Im so sorry about this one.

Reported-by: syzbot+65badd5e74ec62cb67dc@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <redacted>
---
 net/kcm/kcmsock.c | 5 -----
 1 file changed, 5 deletions(-)
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
index 1c572c8daced..6201965bd822 100644
--- a/net/kcm/kcmsock.c
+++ b/net/kcm/kcmsock.c
@@ -1066,11 +1066,6 @@ static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
 		goto partial_message;
 	}
 
-	if (skb_has_frag_list(head)) {
-		kfree_skb_list(skb_shinfo(head)->frag_list);
-		skb_shinfo(head)->frag_list = NULL;
-	}
-
 	if (head != kcm->seq_skb)
 		kfree_skb(head);
 
-- 
2.31.1

[PATCH v2] revert "net: kcm: fix memory leak in kcm_sendmsg"

From: Pavel Skripkin <hidden>
Date: 2021-06-07 18:47:17

In commit c47cc304990a ("net: kcm: fix memory leak in kcm_sendmsg")
I misunderstood the root case of the memory leak and came up with
completely broken fix.

So, simply revert this commit to avoid GPF reported by
syzbot.

Im so sorry for this situation.

Fixes: c47cc304990a ("net: kcm: fix memory leak in kcm_sendmsg")
Reported-by: syzbot+65badd5e74ec62cb67dc@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <redacted>
---

Changes in v2:
	Added Fixes tag
	Improved commit message

---
 net/kcm/kcmsock.c | 5 -----
 1 file changed, 5 deletions(-)
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
index 1c572c8daced..6201965bd822 100644
--- a/net/kcm/kcmsock.c
+++ b/net/kcm/kcmsock.c
@@ -1066,11 +1066,6 @@ static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
 		goto partial_message;
 	}
 
-	if (skb_has_frag_list(head)) {
-		kfree_skb_list(skb_shinfo(head)->frag_list);
-		skb_shinfo(head)->frag_list = NULL;
-	}
-
 	if (head != kcm->seq_skb)
 		kfree_skb(head);
 
-- 
2.31.1

Re: [PATCH v2] revert "net: kcm: fix memory leak in kcm_sendmsg"

From: patchwork-bot+netdevbpf@kernel.org
Date: 2021-06-07 20:40:06

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Mon,  7 Jun 2021 21:46:23 +0300 you wrote:
In commit c47cc304990a ("net: kcm: fix memory leak in kcm_sendmsg")
I misunderstood the root case of the memory leak and came up with
completely broken fix.

So, simply revert this commit to avoid GPF reported by
syzbot.

[...]
Here is the summary with links:
  - [v2] revert "net: kcm: fix memory leak in kcm_sendmsg"
    https://git.kernel.org/netdev/net/c/a47c397bb29f

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