[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1481098267-25801-1-git-send-email-zhouzhouyi@gmail.com>
Date: Wed, 7 Dec 2016 16:11:07 +0800
From: Zhouyi Zhou <zhouzhouyi@...il.com>
To: <jon.maloy@...csson.com>, <ying.xue@...driver.com>,
<davem@...emloft.net>, <netdev@...r.kernel.org>,
<tipc-discussion@...ts.sourceforge.net>,
<linux-kernel@...r.kernel.org>
Cc: Zhouyi Zhou <zhouzhouyi@...il.com>,
Zhouyi Zhou <yizhouzhou@....ac.cn>
Subject: [PATCH 1/1] tipc: return value of skb_linearize should be handled
return value of skb_linearize should be handled
Signed-off-by: Zhouyi Zhou <yizhouzhou@....ac.cn>
Reviewed-by: Cong Wang <xiyou.wangcong@...il.com>
Reviewed-by: Yuval Shaia <yuval.shaia@...cle.com>
Reviewed-by: Eric Dumazet <eric.dumazet@...il.com>
---
net/tipc/link.c | 3 ++-
net/tipc/name_distr.c | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/tipc/link.c b/net/tipc/link.c
index bda89bf..077c570 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1446,7 +1446,8 @@ 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);
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index c1cfd92..4e05d2a 100644
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -356,7 +356,10 @@ void tipc_named_rcv(struct net *net, struct sk_buff_head *inputq)
spin_lock_bh(&tn->nametbl_lock);
for (skb = skb_dequeue(inputq); skb; skb = skb_dequeue(inputq)) {
- skb_linearize(skb);
+ if (skb_linearize(skb)) {
+ kfree_skb(skb);
+ continue;
+ }
msg = buf_msg(skb);
mtype = msg_type(msg);
item = (struct distr_item *)msg_data(msg);
--
1.9.1
Powered by blists - more mailing lists