Commit ae50dfd6 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 Miller:

 1) Ensure that mtu is at least IPV6_MIN_MTU in ipv6 VTI tunnel driver,
    from Steffen Klassert.

 2) Fix crashes when user tries to get_next_key on an LPM bpf map, from
    Alexei Starovoitov.

 3) Fix detection of VLAN fitlering feature for bnx2x VF devices, from
    Michal Schmidt.

 4) We can get a divide by zero when TCP socket are morphed into
    listening state, fix from Eric Dumazet.

 5) Fix socket refcounting bugs in skb_complete_wifi_ack() and
    skb_complete_tx_timestamp(). From Eric Dumazet.

 6) Use after free in dccp_feat_activate_values(), also from Eric
    Dumazet.

 7) Like bonding team needs to use ETH_MAX_MTU as netdev->max_mtu, from
    Jarod Wilson.

 8) Fix use after free in vrf_xmit(), from David Ahern.

 9) Don't do UDP Fragmentation Offload on IPComp ipsec packets, from
    Alexey Kodanev.

10) Properly check napi_complete_done() return value in order to decide
    whether to re-enable IRQs or not in amd-xgbe driver, from Thomas
    Lendacky.

11) Fix double free of hwmon device in marvell phy driver, from Andrew
    Lunn.

12) Don't crash on malformed netlink attributes in act_connmark, from
    Etienne Noss.

13) Don't remove routes with a higher metric in ipv6 ECMP route replace,
    from Sabrina Dubroca.

14) Don't write into a cloned SKB in ipv6 fragmentation handling, from
    Florian Westphal.

15) Fix routing redirect races in dccp and tcp, basically the ICMP
    handler can't modify the socket's cached route in it's locked by the
    user at this moment. From Jon Maxwell.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (108 commits)
  qed: Enable iSCSI Out-of-Order
  qed: Correct out-of-bound access in OOO history
  qed: Fix interrupt flags on Rx LL2
  qed: Free previous connections when releasing iSCSI
  qed: Fix mapping leak on LL2 rx flow
  qed: Prevent creation of too-big u32-chains
  qed: Align CIDs according to DORQ requirement
  mlxsw: reg: Fix SPVMLR max record count
  mlxsw: reg: Fix SPVM max record count
  net: Resend IGMP memberships upon peer notification.
  dccp: fix memory leak during tear-down of unsuccessful connection request
  tun: fix premature POLLOUT notification on tun devices
  dccp/tcp: fix routing redirect race
  ucc/hdlc: fix two little issue
  vxlan: fix ovs support
  net: use net->count to check whether a netns is alive or not
  bridge: drop netfilter fake rtable unconditionally
  ipv6: avoid write to a possibly cloned skb
  net: wimax/i2400m: fix NULL-deref at probe
  isdn/gigaset: fix NULL-deref at probe
  ...
parents 352526f4 1e6a1cd8

Documentation/devicetree/bindings/powerpc/4xx/emac.txt

+60 −2
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ 
			  For Axon it can be absent, though my current driver

			  doesn't handle phy-address yet so for now, keep

			  0x00ffffff in it.

    - phy-handle	: Used to describe configurations where a external PHY

			  is used. Please refer to:

			  Documentation/devicetree/bindings/net/ethernet.txt

    - rx-fifo-size-gige : 1 cell, Rx fifo size in bytes for 1000 Mb/sec

			  operations (if absent the value is the same as

			  rx-fifo-size).  For Axon, either absent or 2048.
@@ -81,8 +84,22 @@ 
			  offload, phandle of the TAH device node.

    - tah-channel       : 1 cell, optional. If appropriate, channel used on the

			  TAH engine.

    - fixed-link	: Fixed-link subnode describing a link to a non-MDIO

			  managed entity. See

			  Documentation/devicetree/bindings/net/fixed-link.txt

			  for details.

    - mdio subnode	: When the EMAC has a phy connected to its local

			  mdio, which us supported by the kernel's network

			  PHY library in drivers/net/phy, there must be device

			  tree subnode with the following required properties:

				- #address-cells: Must be <1>.

				- #size-cells: Must be <0>.



    Example:

			  For PHY definitions: Please refer to

			  Documentation/devicetree/bindings/net/phy.txt and

			  Documentation/devicetree/bindings/net/ethernet.txt



    Examples:



	EMAC0: ethernet@40000800 {

		device_type = "network";
@@ -104,6 +121,48 @@ 
		zmii-channel = <0>;

	};



	EMAC1: ethernet@ef600c00 {

		device_type = "network";

		compatible = "ibm,emac-apm821xx", "ibm,emac4sync";

		interrupt-parent = <&EMAC1>;

		interrupts = <0 1>;

		#interrupt-cells = <1>;

		#address-cells = <0>;

		#size-cells = <0>;

		interrupt-map = <0 &UIC2 0x10 IRQ_TYPE_LEVEL_HIGH /* Status */

				 1 &UIC2 0x14 IRQ_TYPE_LEVEL_HIGH /* Wake */>;

		reg = <0xef600c00 0x000000c4>;

		local-mac-address = [000000000000]; /* Filled in by U-Boot */

		mal-device = <&MAL0>;

		mal-tx-channel = <0>;

		mal-rx-channel = <0>;

		cell-index = <0>;

		max-frame-size = <9000>;

		rx-fifo-size = <16384>;

		tx-fifo-size = <2048>;

		fifo-entry-size = <10>;

		phy-mode = "rgmii";

		phy-handle = <&phy0>;

		phy-map = <0x00000000>;

		rgmii-device = <&RGMII0>;

		rgmii-channel = <0>;

		tah-device = <&TAH0>;

		tah-channel = <0>;

		has-inverted-stacr-oc;

		has-new-stacr-staopc;



	        mdio {

			#address-cells = <1>;

			#size-cells = <0>;



			phy0: ethernet-phy@0 {

				compatible = "ethernet-phy-ieee802.3-c22";

				reg = <0>;

			};

		};

	};





      ii) McMAL node



    Required properties:
@@ -145,4 +204,3 @@ 
    - revision           : as provided by the RGMII new version register if

			   available.

			   For Axon: 0x0000012a

Documentation/networking/ip-sysctl.txt

+2 −1
Original line number Diff line number Diff line
@@ -1006,7 +1006,8 @@ accept_redirects - BOOLEAN 
		FALSE (router)



forwarding - BOOLEAN

	Enable IP forwarding on this interface.

	Enable IP forwarding on this interface.  This controls whether packets

	received _on_ this interface can be forwarded.



mc_forwarding - BOOLEAN

	Do multicast routing. The kernel needs to be compiled with CONFIG_MROUTE

crypto/af_alg.c

+5 −4
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ unlock: 
	return err;

}



int af_alg_accept(struct sock *sk, struct socket *newsock)

int af_alg_accept(struct sock *sk, struct socket *newsock, bool kern)

{

	struct alg_sock *ask = alg_sk(sk);

	const struct af_alg_type *type;
@@ -281,7 +281,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) 
	if (!type)

		goto unlock;



	sk2 = sk_alloc(sock_net(sk), PF_ALG, GFP_KERNEL, &alg_proto, 0);

	sk2 = sk_alloc(sock_net(sk), PF_ALG, GFP_KERNEL, &alg_proto, kern);

	err = -ENOMEM;

	if (!sk2)

		goto unlock;
@@ -323,9 +323,10 @@ unlock: 
}

EXPORT_SYMBOL_GPL(af_alg_accept);



static int alg_accept(struct socket *sock, struct socket *newsock, int flags)

static int alg_accept(struct socket *sock, struct socket *newsock, int flags,

		      bool kern)

{

	return af_alg_accept(sock->sk, newsock);

	return af_alg_accept(sock->sk, newsock, kern);

}



static const struct proto_ops alg_proto_ops = {

crypto/algif_hash.c

+5 −4
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ unlock: 
	return err ?: len;

}



static int hash_accept(struct socket *sock, struct socket *newsock, int flags)

static int hash_accept(struct socket *sock, struct socket *newsock, int flags,

		       bool kern)

{

	struct sock *sk = sock->sk;

	struct alg_sock *ask = alg_sk(sk);
@@ -260,7 +261,7 @@ static int hash_accept(struct socket *sock, struct socket *newsock, int flags) 
	if (err)

		return err;



	err = af_alg_accept(ask->parent, newsock);

	err = af_alg_accept(ask->parent, newsock, kern);

	if (err)

		return err;
@@ -378,7 +379,7 @@ static int hash_recvmsg_nokey(struct socket *sock, struct msghdr *msg, 
}



static int hash_accept_nokey(struct socket *sock, struct socket *newsock,

			     int flags)

			     int flags, bool kern)

{

	int err;
@@ -386,7 +387,7 @@ static int hash_accept_nokey(struct socket *sock, struct socket *newsock, 
	if (err)

		return err;



	return hash_accept(sock, newsock, flags);

	return hash_accept(sock, newsock, flags, kern);

}



static struct proto_ops algif_hash_ops_nokey = {

drivers/isdn/gigaset/bas-gigaset.c

+3 −0
Original line number Diff line number Diff line
@@ -2317,6 +2317,9 @@ static int gigaset_probe(struct usb_interface *interface, 
		return -ENODEV;

	}



	if (hostif->desc.bNumEndpoints < 1)

		return -ENODEV;



	dev_info(&udev->dev,

		 "%s: Device matched (Vendor: 0x%x, Product: 0x%x)\n",

		 __func__, le16_to_cpu(udev->descriptor.idVendor),

CRA Git | Maintained and supported by SUSTech CRA and CCSE