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

Commit 155d4551 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  netfilter: xt_connbytes: handle negation correctly
  net: relax rcvbuf limits
  rps: fix insufficient bounds checking in store_rps_dev_flow_table_cnt()
  net: introduce DST_NOPEER dst flag
  mqprio: Avoid panic if no options are provided
  bridge: provide a mtu() method for fake_dst_ops
parents ad1fca20 6350323a

include/net/dst.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct dst_entry { 
#define DST_NOHASH		0x0008

#define DST_NOCACHE		0x0010

#define DST_NOCOUNT		0x0020

#define DST_NOPEER		0x0040



	short			error;

	short			obsolete;

include/net/sock.h

+3 −1
Original line number Diff line number Diff line
@@ -637,12 +637,14 @@ static inline void __sk_add_backlog(struct sock *sk, struct sk_buff *skb) 


/*

 * Take into account size of receive queue and backlog queue

 * Do not take into account this skb truesize,

 * to allow even a single big packet to come.

 */

static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff *skb)

{

	unsigned int qsize = sk->sk_backlog.len + atomic_read(&sk->sk_rmem_alloc);



	return qsize + skb->truesize > sk->sk_rcvbuf;

	return qsize > sk->sk_rcvbuf;

}



/* The per-socket spinlock must be held here. */

net/bridge/br_netfilter.c

+7 −1
Original line number Diff line number Diff line
@@ -114,12 +114,18 @@ static struct neighbour *fake_neigh_lookup(const struct dst_entry *dst, const vo 
	return NULL;

}



static unsigned int fake_mtu(const struct dst_entry *dst)

{

	return dst->dev->mtu;

}



static struct dst_ops fake_dst_ops = {

	.family =		AF_INET,

	.protocol =		cpu_to_be16(ETH_P_IP),

	.update_pmtu =		fake_update_pmtu,

	.cow_metrics =		fake_cow_metrics,

	.neigh_lookup =		fake_neigh_lookup,

	.mtu =			fake_mtu,

};



/*
@@ -141,7 +147,7 @@ void br_netfilter_rtable_init(struct net_bridge *br) 
	rt->dst.dev = br->dev;

	rt->dst.path = &rt->dst;

	dst_init_metrics(&rt->dst, br_dst_default_metrics, true);

	rt->dst.flags	= DST_NOXFRM;

	rt->dst.flags	= DST_NOXFRM | DST_NOPEER;

	rt->dst.ops = &fake_dst_ops;

}

net/core/net-sysfs.c

+5 −2
Original line number Diff line number Diff line
@@ -665,11 +665,14 @@ static ssize_t store_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue, 
	if (count) {

		int i;



		if (count > 1<<30) {

		if (count > INT_MAX)

			return -EINVAL;

		count = roundup_pow_of_two(count);

		if (count > (ULONG_MAX - sizeof(struct rps_dev_flow_table))

				/ sizeof(struct rps_dev_flow)) {

			/* Enforce a limit to prevent overflow */

			return -EINVAL;

		}

		count = roundup_pow_of_two(count);

		table = vmalloc(RPS_DEV_FLOW_TABLE_SIZE(count));

		if (!table)

			return -ENOMEM;

net/core/sock.c

+1 −5
Original line number Diff line number Diff line
@@ -288,11 +288,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
	unsigned long flags;

	struct sk_buff_head *list = &sk->sk_receive_queue;



	/* Cast sk->rcvbuf to unsigned... It's pointless, but reduces

	   number of warnings when compiling with -W --ANK

	 */

	if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=

	    (unsigned)sk->sk_rcvbuf) {

	if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {

		atomic_inc(&sk->sk_drops);

		trace_sock_rcvqueue_full(sk, skb);

		return -ENOMEM;