Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7487449c authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

IPv4: early demux can return an error code 



Currently no error is emitted, but this infrastructure will
used by the next patch to allow source address validation
for mcast sockets.
Since early demux can do a route lookup and an ipv4 route
lookup can return an error code this is consistent with the
current ipv4 route infrastructure.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d41bb33b

include/net/protocol.h

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 


/* This is used to register protocols. */

struct net_protocol {

	void			(*early_demux)(struct sk_buff *skb);

	void                    (*early_demux_handler)(struct sk_buff *skb);

	int			(*early_demux)(struct sk_buff *skb);

	int			(*early_demux_handler)(struct sk_buff *skb);

	int			(*handler)(struct sk_buff *skb);

	void			(*err_handler)(struct sk_buff *skb, u32 info);

	unsigned int		no_policy:1,

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ void tcp_v4_err(struct sk_buff *skb, u32); 


void tcp_shutdown(struct sock *sk, int how);



void tcp_v4_early_demux(struct sk_buff *skb);

int tcp_v4_early_demux(struct sk_buff *skb);

int tcp_v4_rcv(struct sk_buff *skb);



int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);

include/net/udp.h

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static inline struct sk_buff *skb_recv_udp(struct sock *sk, unsigned int flags, 
	return __skb_recv_udp(sk, flags, noblock, &peeked, &off, err);

}



void udp_v4_early_demux(struct sk_buff *skb);

int udp_v4_early_demux(struct sk_buff *skb);

bool udp_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst);

int udp_get_port(struct sock *sk, unsigned short snum,

		 int (*saddr_cmp)(const struct sock *,

net/ipv4/ip_input.c

+15 −10
Original line number Diff line number Diff line
@@ -311,9 +311,10 @@ static inline bool ip_rcv_options(struct sk_buff *skb) 
static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb)

{

	const struct iphdr *iph = ip_hdr(skb);

	struct rtable *rt;

	int (*edemux)(struct sk_buff *skb);

	struct net_device *dev = skb->dev;

	void (*edemux)(struct sk_buff *skb);

	struct rtable *rt;

	int err;



	/* if ingress device is enslaved to an L3 master device pass the

	 * skb to its handler for processing
@@ -331,7 +332,9 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb) 


		ipprot = rcu_dereference(inet_protos[protocol]);

		if (ipprot && (edemux = READ_ONCE(ipprot->early_demux))) {

			edemux(skb);

			err = edemux(skb);

			if (unlikely(err))

				goto drop_error;

			/* must reload iph, skb->head might have changed */

			iph = ip_hdr(skb);

		}
@@ -342,13 +345,10 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb) 
	 *	how the packet travels inside Linux networking.

	 */

	if (!skb_valid_dst(skb)) {

		int err = ip_route_input_noref(skb, iph->daddr, iph->saddr,

		err = ip_route_input_noref(skb, iph->daddr, iph->saddr,

					   iph->tos, dev);

		if (unlikely(err)) {

			if (err == -EXDEV)

				__NET_INC_STATS(net, LINUX_MIB_IPRPFILTER);

			goto drop;

		}

		if (unlikely(err))

			goto drop_error;

	}



#ifdef CONFIG_IP_ROUTE_CLASSID
@@ -399,6 +399,11 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb) 
drop:

	kfree_skb(skb);

	return NET_RX_DROP;



drop_error:

	if (err == -EXDEV)

		__NET_INC_STATS(net, LINUX_MIB_IPRPFILTER);

	goto drop;

}



/*

net/ipv4/tcp_ipv4.c

+5 −4
Original line number Diff line number Diff line
@@ -1503,23 +1503,23 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
}

EXPORT_SYMBOL(tcp_v4_do_rcv);



void tcp_v4_early_demux(struct sk_buff *skb)

int tcp_v4_early_demux(struct sk_buff *skb)

{

	const struct iphdr *iph;

	const struct tcphdr *th;

	struct sock *sk;



	if (skb->pkt_type != PACKET_HOST)

		return;

		return 0;



	if (!pskb_may_pull(skb, skb_transport_offset(skb) + sizeof(struct tcphdr)))

		return;

		return 0;



	iph = ip_hdr(skb);

	th = tcp_hdr(skb);



	if (th->doff < sizeof(struct tcphdr) / 4)

		return;

		return 0;



	sk = __inet_lookup_established(dev_net(skb->dev), &tcp_hashinfo,

				       iph->saddr, th->source,
@@ -1538,6 +1538,7 @@ void tcp_v4_early_demux(struct sk_buff *skb) 
				skb_dst_set_noref(skb, dst);

		}

	}

	return 0;

}



bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb)