From 973b1b9a454c738edbb2eb8d4596014b575dc15c Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Tue, 20 Nov 2012 00:53:58 +0000 Subject: caif: Remove redundant null check before kfree in cfctrl.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit kfree on a null pointer is a no-op. Signed-off-by: Sachin Kamat Acked-by: Sjur Brændeland Signed-off-by: David S. Miller --- net/caif/cfctrl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'net/caif') diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c index 44f270fc2d06..a376ec1ac0a7 100644 --- a/net/caif/cfctrl.c +++ b/net/caif/cfctrl.c @@ -515,8 +515,7 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt) client_layer : NULL); } - if (req != NULL) - kfree(req); + kfree(req); spin_unlock_bh(&cfctrl->info_list_lock); } -- cgit v1.2.3 From 406636340c301b46062b22f94e3815ef767bd6a3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 7 Dec 2012 06:17:26 +0000 Subject: caif_usb: Check driver name before reading driver state in netdev notifier In cfusbl_device_notify(), the usbnet and usbdev variables are initialised before the driver name has been checked. In case the device's driver is not cdc_ncm, this may result in reading beyond the end of the netdev private area. Move the initialisation below the driver name check. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller --- net/caif/caif_usb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'net/caif') diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c index fd7cbf5aa895..582f80c8ef3d 100644 --- a/net/caif/caif_usb.c +++ b/net/caif/caif_usb.c @@ -126,8 +126,8 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, struct net_device *dev = arg; struct caif_dev_common common; struct cflayer *layer, *link_support; - struct usbnet *usbnet = netdev_priv(dev); - struct usb_device *usbdev = usbnet->udev; + struct usbnet *usbnet; + struct usb_device *usbdev; struct ethtool_drvinfo drvinfo; /* @@ -141,6 +141,9 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, if (strncmp(drvinfo.driver, "cdc_ncm", 7) != 0) return 0; + usbnet = netdev_priv(dev); + usbdev = usbnet->udev; + pr_debug("USB CDC NCM device VID:0x%4x PID:0x%4x\n", le16_to_cpu(usbdev->descriptor.idVendor), le16_to_cpu(usbdev->descriptor.idProduct)); -- cgit v1.2.3 From 65d2897c0f1b240420d657f41e561239fa10ba94 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 7 Dec 2012 06:20:27 +0000 Subject: caif_usb: Make the driver name check more efficient Use the device model to get just the name, rather than using the ethtool API to get all driver information. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller --- net/caif/caif_usb.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'net/caif') diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c index 582f80c8ef3d..3ebc8cbc91ff 100644 --- a/net/caif/caif_usb.c +++ b/net/caif/caif_usb.c @@ -128,17 +128,10 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, struct cflayer *layer, *link_support; struct usbnet *usbnet; struct usb_device *usbdev; - struct ethtool_drvinfo drvinfo; - /* - * Quirks: High-jack ethtool to find if we have a NCM device, - * and find it's VID/PID. - */ - if (dev->ethtool_ops == NULL || dev->ethtool_ops->get_drvinfo == NULL) - return 0; - - dev->ethtool_ops->get_drvinfo(dev, &drvinfo); - if (strncmp(drvinfo.driver, "cdc_ncm", 7) != 0) + /* Check whether we have a NCM device, and find its VID/PID. */ + if (!(dev->dev.parent && dev->dev.parent->driver && + strcmp(dev->dev.parent->driver->name, "cdc_ncm") == 0)) return 0; usbnet = netdev_priv(dev); -- cgit v1.2.3