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

Commit 9ff55874 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by David S. Miller
Browse files

rndis_host: Halt device if rndis_bind fails. 



When bind fails after device was initialized, shutdown device properly
by sending RNDIS_MSG_HALT.

Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarBjorge Dijkstra <bjd@jooz.net>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 04c3c01a

drivers/net/usb/rndis_host.c

+9 −3
Original line number Diff line number Diff line
@@ -467,6 +467,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf) 
		struct rndis_query_c	*get_c;

		struct rndis_set	*set;

		struct rndis_set_c	*set_c;

		struct rndis_halt	*halt;

	} u;

	u32			tmp;

	int			reply_len;
@@ -517,7 +518,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf) 
				"dev can't take %u byte packets (max %u)\n",

				dev->hard_mtu, tmp);

			retval = -EINVAL;

			goto fail_and_release;

			goto halt_fail_and_release;

		}

		dev->hard_mtu = tmp;

		net->mtu = dev->hard_mtu - net->hard_header_len;
@@ -539,7 +540,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf) 
			48, (void **) &bp, &reply_len);

	if (unlikely(retval< 0)) {

		dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval);

		goto fail_and_release;

		goto halt_fail_and_release;

	}

	memcpy(net->dev_addr, bp, ETH_ALEN);
@@ -555,7 +556,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf) 
	retval = rndis_command(dev, u.header);

	if (unlikely(retval < 0)) {

		dev_err(&intf->dev, "rndis set packet filter, %d\n", retval);

		goto fail_and_release;

		goto halt_fail_and_release;

	}



	retval = 0;
@@ -563,6 +564,11 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf) 
	kfree(u.buf);

	return retval;



halt_fail_and_release:

	memset(u.halt, 0, sizeof *u.halt);

	u.halt->msg_type = RNDIS_MSG_HALT;

	u.halt->msg_len = ccpu2(sizeof *u.halt);

	(void) rndis_command(dev, (void *)u.halt);

fail_and_release:

	usb_set_intfdata(info->data, NULL);

	usb_driver_release_interface(driver_of(intf), info->data);