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

Commit 4a873f53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David S. Miller:

 1) Since we do RCU lookups on ipv4 FIB entries, we have to test if the
    entry is dead before returning it to our caller.

 2) openvswitch locking and packet validation fixes from Ansis Atteka,
    Jesse Gross, and Pravin B Shelar.

 3) Fix PM resume locking in IGB driver, from Benjamin Poirier.

 4) Fix VLAN header handling in vhost-net and macvtap, from Basil Gor.

 5) Revert a bogus network namespace isolation change that was causing
    regressions on S390 networking devices.

 6) If bonding decides to process and handle a LACPDU frame, we
    shouldn't bump the rx_dropped counter.  From Jiri Bohac.

 7) Fix mis-calculation of available TX space in r8169 driver when doing
    TSO, which can lead to crashes and/or hung device.  From Julien
    Ducourthial.

 8) SCTP does not validate cached routes properly in all cases, from
    Nicolas Dichtel.

 9) Link status interrupt needs to be handled in ks8851 driver, from
    Stephen Boyd.

10) Use capable(), not cap_raised(), in connector/userns netlink code.
    From Eric W. Biederman via Andrew Morton.

11) Fix pktgen OOPS on module unload, from Eric Dumazet.

12) iwlwifi under-estimates SKB truesizes, also from Eric Dumazet.

13) Cure division by zero in SFC driver, from Ben Hutchings.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
  ks8851: Update link status during link change interrupt
  macvtap: restore vlan header on user read
  vhost-net: fix handle_rx buffer size
  bonding: don't increase rx_dropped after processing LACPDUs
  connector/userns: replace netlink uses of cap_raised() with capable()
  sctp: check cached dst before using it
  pktgen: fix crash at module unload
  Revert "net: maintain namespace isolation between vlan and real device"
  ehea: fix losing of NEQ events when one event occurred early
  igb: fix rtnl race in PM resume path
  ipv4: Do not use dead fib_info entries.
  r8169: fix unsigned int wraparound with TSO
  sfc: Fix division by zero when using one RX channel and no SR-IOV
  openvswitch: Validation of IPv6 set port action uses IPv4 header
  net: compare_ether_addr[_64bits]() has no ordering
  cdc_ether: Ignore bogus union descriptor for RNDIS devices
  bnx2x: bug fix when loading after SAN boot
  e1000: Silence sparse warnings by correcting type
  igb, ixgbe: netdev_tx_reset_queue incorrectly called from tx init path
  openvswitch: Release rtnl_lock if ovs_vport_cmd_build_info() failed.
  ...
parents 2eb42967 062e55e3

drivers/block/drbd/drbd_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -2297,7 +2297,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms 
		return;

	}



	if (!cap_raised(current_cap(), CAP_SYS_ADMIN)) {

	if (!capable(CAP_SYS_ADMIN)) {

		retcode = ERR_PERM;

		goto fail;

	}

drivers/md/dm-log-userspace-transfer.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void cn_ulog_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp) 
{

	struct dm_ulog_request *tfr = (struct dm_ulog_request *)(msg + 1);



	if (!cap_raised(current_cap(), CAP_SYS_ADMIN))

	if (!capable(CAP_SYS_ADMIN))

		return;



	spin_lock(&receiving_list_lock);

drivers/net/bonding/bond_3ad.c

+12 −6
Original line number Diff line number Diff line
@@ -2173,9 +2173,10 @@ void bond_3ad_state_machine_handler(struct work_struct *work) 
 * received frames (loopback). Since only the payload is given to this

 * function, it check for loopback.

 */

static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length)

static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length)

{

	struct port *port;

	int ret = RX_HANDLER_ANOTHER;



	if (length >= sizeof(struct lacpdu)) {
@@ -2184,11 +2185,12 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u 
		if (!port->slave) {

			pr_warning("%s: Warning: port of slave %s is uninitialized\n",

				   slave->dev->name, slave->dev->master->name);

			return;

			return ret;

		}



		switch (lacpdu->subtype) {

		case AD_TYPE_LACPDU:

			ret = RX_HANDLER_CONSUMED;

			pr_debug("Received LACPDU on port %d\n",

				 port->actor_port_number);

			/* Protect against concurrent state machines */
@@ -2198,6 +2200,7 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u 
			break;



		case AD_TYPE_MARKER:

			ret = RX_HANDLER_CONSUMED;

			// No need to convert fields to Little Endian since we don't use the marker's fields.



			switch (((struct bond_marker *)lacpdu)->tlv_type) {
@@ -2219,6 +2222,7 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u 
			}

		}

	}

	return ret;

}



/**
@@ -2456,18 +2460,20 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev) 
	return NETDEV_TX_OK;

}



void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,

int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,

			  struct slave *slave)

{

	int ret = RX_HANDLER_ANOTHER;

	if (skb->protocol != PKT_TYPE_LACPDU)

		return;

		return ret;



	if (!pskb_may_pull(skb, sizeof(struct lacpdu)))

		return;

		return ret;



	read_lock(&bond->lock);

	bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);

	ret = bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);

	read_unlock(&bond->lock);

	return ret;

}



/*

drivers/net/bonding/bond_3ad.h

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave); 
void bond_3ad_handle_link_change(struct slave *slave, char link);

int  bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info);

int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev);

void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,

int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,

			  struct slave *slave);

int bond_3ad_set_carrier(struct bonding *bond);

void bond_3ad_update_lacp_rate(struct bonding *bond);

drivers/net/bonding/bond_main.c

+11 −5
Original line number Diff line number Diff line
@@ -1444,8 +1444,9 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) 
	struct sk_buff *skb = *pskb;

	struct slave *slave;

	struct bonding *bond;

	void (*recv_probe)(struct sk_buff *, struct bonding *,

	int (*recv_probe)(struct sk_buff *, struct bonding *,

				struct slave *);

	int ret = RX_HANDLER_ANOTHER;



	skb = skb_share_check(skb, GFP_ATOMIC);

	if (unlikely(!skb))
@@ -1464,8 +1465,12 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) 
		struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);



		if (likely(nskb)) {

			recv_probe(nskb, bond, slave);

			ret = recv_probe(nskb, bond, slave);

			dev_kfree_skb(nskb);

			if (ret == RX_HANDLER_CONSUMED) {

				consume_skb(skb);

				return ret;

			}

		}

	}
@@ -1487,7 +1492,7 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) 
		memcpy(eth_hdr(skb)->h_dest, bond->dev->dev_addr, ETH_ALEN);

	}



	return RX_HANDLER_ANOTHER;

	return ret;

}



/* enslave device <slave> to bond device <master> */
@@ -2723,7 +2728,7 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32 
	}

}



static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,

static int bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,

			 struct slave *slave)

{

	struct arphdr *arp;
@@ -2731,7 +2736,7 @@ static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond, 
	__be32 sip, tip;



	if (skb->protocol != __cpu_to_be16(ETH_P_ARP))

		return;

		return RX_HANDLER_ANOTHER;



	read_lock(&bond->lock);
@@ -2776,6 +2781,7 @@ static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond, 


out_unlock:

	read_unlock(&bond->lock);

	return RX_HANDLER_ANOTHER;

}



/*