diff options
| author | Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com> | 2017-08-24 16:31:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-24 21:54:34 -0700 |
| commit | 27163138b4d80e36f2006273d66b6c122d241f30 (patch) | |
| tree | 7189104c04f9c6ee939528ded9ce64daf5512df9 | |
| parent | 551143d8d954fe398324a5caa276f518466c428b (diff) | |
| download | op-kernel-dev-27163138b4d80e36f2006273d66b6c122d241f30.zip op-kernel-dev-27163138b4d80e36f2006273d66b6c122d241f30.tar.gz | |
tipc: perform skb_linearize() before parsing the inner header
In tipc_rcv(), we linearize only the header and usually the packets
are consumed as the nodes permit direct reception. However, if the
skb contains tunnelled message due to fail over or synchronization
we parse it in tipc_node_check_state() without performing
linearization. This will cause link disturbances if the skb was
non linear.
In this commit, we perform linearization for the above messages.
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/tipc/node.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 9b4dcb6..b113a52 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -1557,6 +1557,8 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b) /* Check/update node state before receiving */ if (unlikely(skb)) { + if (unlikely(skb_linearize(skb))) + goto discard; tipc_node_write_lock(n); if (tipc_node_check_state(n, skb, bearer_id, &xmitq)) { if (le->link) { |
