Merge tag 'ieee802154-for-davem-2019-09-28' of... (3755ee22) · Commits · 戴 / test

Merge tag 'ieee802154-for-davem-2019-09-28' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan Stefan Schmidt says: ==================== pull-request: ieee802154 for net 2019-09-28 An update from ieee802154 for your *net* tree. Three driver fixes. Navid Emamdoost fixed a memory leak on an error path in the ca8210 driver, Johan Hovold fixed a use-after-free found by syzbot in the atusb driver and Christophe JAILLET makes sure __skb_put_data is used instead of memcpy in the mcr20a driver I switched from branches to tags here to be pulled from. So far not annotated and not signed. Once I fixed my scripts it should contain this messages as annotations. If you want it signed as well just tell me. If there are any problems let me know. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ieee802154/atusb.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1137,10 +1137,11 @@ static void atusb_disconnect(struct usb_interface *interface)

		ieee802154_unregister_hw(atusb->hw);

		usb_put_dev(atusb->usb_dev);

		ieee802154_free_hw(atusb->hw);

		usb_set_intfdata(interface, NULL);
		usb_put_dev(atusb->usb_dev);

		pr_debug("%s done\n", __func__);
		}

drivers/net/ieee802154/ca8210.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3145,12 +3145,12 @@ static int ca8210_probe(struct spi_device *spi_device)
		goto error;
		}

		priv->spi->dev.platform_data = pdata;
		ret = ca8210_get_platform_data(priv->spi, pdata);
		if (ret) {
		dev_crit(&spi_device->dev, "ca8210_get_platform_data failed\n");
		goto error;
		}
		priv->spi->dev.platform_data = pdata;

		ret = ca8210_dev_com_init(priv);
		if (ret) {

drivers/net/ieee802154/mcr20a.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -800,7 +800,7 @@ mcr20a_handle_rx_read_buf_complete(void *context)
		if (!skb)
		return;

		memcpy(skb_put(skb, len), lp->rx_buf, len);
		__skb_put_data(skb, lp->rx_buf, len);
		ieee802154_rx_irqsafe(lp->hw, skb, lp->rx_lqi[0]);

		print_hex_dump_debug("mcr20a rx: ", DUMP_PREFIX_OFFSET, 16, 1,

Admin message