Commit 36024fcf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) Don't corrupt xfrm_interface parms before validation, from Nicolas
    Dichtel.

 2) Revert use of usb-wakeup in btusb, from Mario Limonciello.

 3) Block ipv6 packets in bridge netfilter if ipv6 is disabled, from
    Leonardo Bras.

 4) IPS_OFFLOAD not honored in ctnetlink, from Pablo Neira Ayuso.

 5) Missing ULP check in sock_map, from John Fastabend.

 6) Fix receive statistic handling in forcedeth, from Zhu Yanjun.

 7) Fix length of SKB allocated in 6pack driver, from Christophe
    JAILLET.

 8) ip6_route_info_create() returns an error pointer, not NULL. From
    Maciej Żenczykowski.

 9) Only add RDS sock to the hashes after rs_transport is set, from
    Ka-Cheong Poon.

10) Don't double clean TX descriptors in ixgbe, from Ilya Maximets.

11) Presence of transmit IPSEC offload in an SKB is not tested for
    correctly in ixgbe and ixgbevf. From Steffen Klassert and Jeff
    Kirsher.

12) Need rcu_barrier() when register_netdevice() takes one of the
    notifier based failure paths, from Subash Abhinov Kasiviswanathan.

13) Fix leak in sctp_do_bind(), from Mao Wenan.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (72 commits)
  cdc_ether: fix rndis support for Mediatek based smartphones
  sctp: destroy bucket if failed to bind addr
  sctp: remove redundant assignment when call sctp_get_port_local
  sctp: change return type of sctp_get_port_local
  ixgbevf: Fix secpath usage for IPsec Tx offload
  sctp: Fix the link time qualifier of 'sctp_ctrlsock_exit()'
  ixgbe: Fix secpath usage for IPsec TX offload.
  net: qrtr: fix memort leak in qrtr_tun_write_iter
  net: Fix null de-reference of device refcount
  ipv6: Fix the link time qualifier of 'ping_v6_proc_exit_net()'
  tun: fix use-after-free when register netdev failed
  tcp: fix tcp_ecn_withdraw_cwr() to clear TCP_ECN_QUEUE_CWR
  ixgbe: fix double clean of Tx descriptors with xdp
  ixgbe: Prevent u8 wrapping of ITR value to something less than 10us
  mlx4: fix spelling mistake "veify" -> "verify"
  net: hns3: fix spelling mistake "undeflow" -> "underflow"
  net: lmc: fix spelling mistake "runnin" -> "running"
  NFC: st95hf: fix spelling mistake "receieve" -> "receive"
  net/rds: An rds_sock is added too early to the hash table
  mac80211: Do not send Layer 2 Update frame before authorization
  ...
parents 1c4c5e25 4d7ffcf3

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -17699,8 +17699,7 @@ F: include/uapi/linux/dqblk_xfs.h 
F:	include/uapi/linux/fsmap.h



XILINX AXI ETHERNET DRIVER

M:	Anirudha Sarangi <anirudh@xilinx.com>

M:	John Linn <John.Linn@xilinx.com>

M:	Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>

S:	Maintained

F:	drivers/net/ethernet/xilinx/xilinx_axienet*

drivers/bluetooth/bpa10x.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 


	usb_free_urb(urb);



	return 0;

	return err;

}



static int bpa10x_set_diag(struct hci_dev *hdev, bool enable)

drivers/bluetooth/btusb.c

+3 −5
Original line number Diff line number Diff line
@@ -384,6 +384,9 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3526), .driver_info = BTUSB_REALTEK },

	{ USB_DEVICE(0x0b05, 0x185c), .driver_info = BTUSB_REALTEK },



	/* Additional Realtek 8822CE Bluetooth devices */

	{ USB_DEVICE(0x04ca, 0x4005), .driver_info = BTUSB_REALTEK },



	/* Silicon Wave based devices */

	{ USB_DEVICE(0x0c10, 0x0000), .driver_info = BTUSB_SWAVE },
@@ -1170,10 +1173,6 @@ static int btusb_open(struct hci_dev *hdev) 
	}



	data->intf->needs_remote_wakeup = 1;

	/* device specific wakeup source enabled and required for USB

	 * remote wakeup while host is suspended

	 */

	device_wakeup_enable(&data->udev->dev);



	if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))

		goto done;
@@ -1238,7 +1237,6 @@ static int btusb_close(struct hci_dev *hdev) 
		goto failed;



	data->intf->needs_remote_wakeup = 0;

	device_wakeup_disable(&data->udev->dev);

	usb_autopm_put_interface(data->intf);



failed:

drivers/bluetooth/hci_qca.c

+6 −4
Original line number Diff line number Diff line
@@ -309,13 +309,14 @@ static void qca_wq_awake_device(struct work_struct *work) 
					    ws_awake_device);

	struct hci_uart *hu = qca->hu;

	unsigned long retrans_delay;

	unsigned long flags;



	BT_DBG("hu %p wq awake device", hu);



	/* Vote for serial clock */

	serial_clock_vote(HCI_IBS_TX_VOTE_CLOCK_ON, hu);



	spin_lock(&qca->hci_ibs_lock);

	spin_lock_irqsave(&qca->hci_ibs_lock, flags);



	/* Send wake indication to device */

	if (send_hci_ibs_cmd(HCI_IBS_WAKE_IND, hu) < 0)
@@ -327,7 +328,7 @@ static void qca_wq_awake_device(struct work_struct *work) 
	retrans_delay = msecs_to_jiffies(qca->wake_retrans);

	mod_timer(&qca->wake_retrans_timer, jiffies + retrans_delay);



	spin_unlock(&qca->hci_ibs_lock);

	spin_unlock_irqrestore(&qca->hci_ibs_lock, flags);



	/* Actually send the packets */

	hci_uart_tx_wakeup(hu);
@@ -338,12 +339,13 @@ static void qca_wq_awake_rx(struct work_struct *work) 
	struct qca_data *qca = container_of(work, struct qca_data,

					    ws_awake_rx);

	struct hci_uart *hu = qca->hu;

	unsigned long flags;



	BT_DBG("hu %p wq awake rx", hu);



	serial_clock_vote(HCI_IBS_RX_VOTE_CLOCK_ON, hu);



	spin_lock(&qca->hci_ibs_lock);

	spin_lock_irqsave(&qca->hci_ibs_lock, flags);

	qca->rx_ibs_state = HCI_IBS_RX_AWAKE;



	/* Always acknowledge device wake up,
@@ -354,7 +356,7 @@ static void qca_wq_awake_rx(struct work_struct *work) 


	qca->ibs_sent_wacks++;



	spin_unlock(&qca->hci_ibs_lock);

	spin_unlock_irqrestore(&qca->hci_ibs_lock, flags);



	/* Actually send the packets */

	hci_uart_tx_wakeup(hu);

drivers/isdn/capi/capi.c

+9 −1
Original line number Diff line number Diff line
@@ -688,6 +688,9 @@ capi_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos 
	if (!cdev->ap.applid)

		return -ENODEV;



	if (count < CAPIMSG_BASELEN)

		return -EINVAL;



	skb = alloc_skb(count, GFP_USER);

	if (!skb)

		return -ENOMEM;
@@ -698,7 +701,8 @@ capi_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos 
	}

	mlen = CAPIMSG_LEN(skb->data);

	if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_REQ) {

		if ((size_t)(mlen + CAPIMSG_DATALEN(skb->data)) != count) {

		if (count < CAPI_DATA_B3_REQ_LEN ||

		    (size_t)(mlen + CAPIMSG_DATALEN(skb->data)) != count) {

			kfree_skb(skb);

			return -EINVAL;

		}
@@ -711,6 +715,10 @@ capi_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos 
	CAPIMSG_SETAPPID(skb->data, cdev->ap.applid);



	if (CAPIMSG_CMD(skb->data) == CAPI_DISCONNECT_B3_RESP) {

		if (count < CAPI_DISCONNECT_B3_RESP_LEN) {

			kfree_skb(skb);

			return -EINVAL;

		}

		mutex_lock(&cdev->lock);

		capincci_free(cdev, CAPIMSG_NCCI(skb->data));

		mutex_unlock(&cdev->lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE