diff options
author | Hoang Le <hoang.h.le@dektech.com.au> | 2019-02-11 09:18:28 +0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-05 15:27:07 +0100 |
commit | 287558db942427d2565e571641075cad1f91b0d3 (patch) | |
tree | 51aad989bd564e77af2e98b4bfe1b796199aa1fa | |
parent | 405480f60907a8c9163d0ba20858ddb6b06f6b26 (diff) | |
download | linux-stable-287558db942427d2565e571641075cad1f91b0d3.tar.gz linux-stable-287558db942427d2565e571641075cad1f91b0d3.tar.bz2 linux-stable-287558db942427d2565e571641075cad1f91b0d3.zip |
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>
-rw-r--r-- | net/tipc/link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 736fffb28ab6..0080699b7cd1 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -883,7 +883,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; }; } |