summaryrefslogtreecommitdiff
path: root/net/tipc/link.c
diff options
context:
space:
mode:
authorHoang Le <hoang.h.le@dektech.com.au>2019-02-11 05:18:28 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-05 11:21:09 +0300
commit66bccc6afb826bb3835aae9a7f28aed22fe8165e (patch)
treed27865e4d2999f491e82c488e255fe28f25eceee /net/tipc/link.c
parent5c29e33a2245be2a2a21657cf0d7a962e66e9b9b (diff)
downloadlinux-66bccc6afb826bb3835aae9a7f28aed22fe8165e.tar.xz
tipc: fix skb may be leaky in tipc_link_input
[ Upstream commit 7384b538d3aed2ed49d3575483d17aeee790fb06 ] When we free skb at tipc_data_input, we return a 'false' boolean. Then, skb passed to subcalling tipc_link_input in tipc_link_rcv, <snip> 1303 int tipc_link_rcv: ... 1354 if (!tipc_data_input(l, skb, l->inputq)) 1355 rc |= tipc_link_input(l, skb, l->inputq); </snip> Fix it by simple changing to a 'true' boolean when skb is being free-ed. Then, tipc_link_rcv will bypassed to subcalling tipc_link_input as above condition. Acked-by: Ying Xue <ying.xue@windriver.com> Acked-by: Jon Maloy <maloy@donjonn.com> Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/tipc/link.c')
-rw-r--r--net/tipc/link.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 6344aca4487b..0fbf8ea18ce0 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1114,7 +1114,7 @@ static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb,
default:
pr_warn("Dropping received illegal msg type\n");
kfree_skb(skb);
- return false;
+ return true;
};
}