Commit 5cbb28a4 authored Oct 28, 2015 by Jon Paul Maloy Committed by David S. Miller Nov 01, 2015

tipc: linearize arriving NAME_DISTR and LINK_PROTO buffers



Testing of the new UDP bearer has revealed that reception of
NAME_DISTRIBUTOR, LINK_PROTOCOL/RESET and LINK_PROTOCOL/ACTIVATE
message buffers is not prepared for the case that those may be
non-linear.

We now linearize all such buffers before they are delivered up to the
generic reception layer.

In order for the commit to apply cleanly to 'net' and 'stable', we do
the change in the function tipc_udp_recv() for now. Later, we will post
a commit to 'net-next' moving the linearization to generic code, in
tipc_named_rcv() and tipc_link_proto_rcv().

Fixes: commit d0f91938 ("tipc: add ip/udp media type")
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f4444574

net/tipc/udp_media.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@
		#include <linux/tipc_netlink.h>
		#include "core.h"
		#include "bearer.h"
		#include "msg.h"

		/* IANA assigned UDP port */
		#define UDP_PORT_DEFAULT 6118
		@@ -222,6 +223,10 @@ static int tipc_udp_recv(struct sock sk, struct sk_buff skb)
		{
		struct udp_bearer *ub;
		struct tipc_bearer *b;
		int usr = msg_user(buf_msg(skb));

		if ((usr == LINK_PROTOCOL) \|\| (usr == NAME_DISTRIBUTOR))
		skb_linearize(skb);

		ub = rcu_dereference_sk_user_data(sk);
		if (!ub) {

Admin message