[net] tipc: Fix potential OOB in tipc_link_proto_rcv()

Message ID 20221203094635.29024-1-yuehaibing@huawei.com
State New
Headers
Series [net] tipc: Fix potential OOB in tipc_link_proto_rcv() |

Commit Message

Yue Haibing Dec. 3, 2022, 9:46 a.m. UTC
  Fix the potential risk of OOB if skb_linearize() fails in
tipc_link_proto_rcv().

Fixes: 5cbb28a4bf65 ("tipc: linearize arriving NAME_DISTR and LINK_PROTO buffers")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 net/tipc/link.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
  

Comments

patchwork-bot+netdevbpf@kernel.org Dec. 6, 2022, 12:10 p.m. UTC | #1
Hello:

This patch was applied to netdev/net.git (master)
by Paolo Abeni <pabeni@redhat.com>:

On Sat, 3 Dec 2022 17:46:35 +0800 you wrote:
> Fix the potential risk of OOB if skb_linearize() fails in
> tipc_link_proto_rcv().
> 
> Fixes: 5cbb28a4bf65 ("tipc: linearize arriving NAME_DISTR and LINK_PROTO buffers")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  net/tipc/link.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Here is the summary with links:
  - [net] tipc: Fix potential OOB in tipc_link_proto_rcv()
    https://git.kernel.org/netdev/net/c/743117a997bb

You are awesome, thank you!
  

Patch

diff --git a/net/tipc/link.c b/net/tipc/link.c
index e260c0d557f5..b3ce24823f50 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2224,7 +2224,9 @@  static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
 	if (tipc_own_addr(l->net) > msg_prevnode(hdr))
 		l->net_plane = msg_net_plane(hdr);
 
-	skb_linearize(skb);
+	if (skb_linearize(skb))
+		goto exit;
+
 	hdr = buf_msg(skb);
 	data = msg_data(hdr);