linux-kernel - [PATCH] usb: core: Change usb_create_sysfs_intf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <7269aca0469928347bbff55c8c2efd1c86cf1f4b.1300979212.git.mina86@mina86.com>
Date:	Thu, 24 Mar 2011 16:13:41 +0100
From:	Michal Nazarewicz <mnazarewicz@...gle.com>
To:	"Alan Stern" <stern@...land.harvard.edu>,
	"Sergey Senozhatsky" <sergey.senozhatsky@...il.com>
Cc:	"Greg Kroah-Hartman" <gregkh@...e.de>,
	"Chris Wright" <chrisw@...s-sol.org>, linux-usb@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Michal Nazarewicz <mina86@...a86.com>,
	Sergey Senozhatsky <sergey.senozhatsky@...il.com>
Subject: [PATCH] usb: core: Change usb_create_sysfs_intf_files()' return type to void

From: Michal Nazarewicz <mina86@...a86.com>

The usb_create_sysfs_intf_files() function always returned zero even
if it failed to create sysfs fails.  Since this is a desired behaviour
there is no need to return return code at all.  This commit changes
function's return type (form int) to void.

Signed-off-by: Michal Nazarewicz <mina86@...a86.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@...il.com>
---
 drivers/usb/core/sysfs.c |    7 +++----
 drivers/usb/core/usb.c   |    3 +--
 drivers/usb/core/usb.h   |    2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

The below patch has not been tested (not even compiled), just a quick scatch.

> On Thu, 24 Mar 2011, Sergey Senozhatsky wrote:
>> I just noticed that usb_create_sysfs_intf_files() ignores  
>> device_create_file() return code and sets intf->sysfs_files_created
>> to 1, even if sysfs_add_file_mode() returned -ENOMEM (or later
>> sysfs_add_one() returned -EEXIST).
>>
>> Shouldn't we check retval for 0 before setting  
>> intf->sysfs_files_created?

On Thu, 24 Mar 2011 15:55:08 +0100, Alan Stern <stern@...land.harvard.edu> wrote:
> No.  We want this routine to succeed even if the sysfs files can't be
> created.  The interface string attribute is more or less optional.
>
> It would be okay to add a comment explaining this, so that other people
> don't make the same mistake (which has already happened -- you're not
> the first).

Can we also drop the return value completely then?


diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index 6781c36..e729480 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -842,11 +842,10 @@ const struct attribute_group *usb_interface_groups[] = {
 	NULL
 };
 
-int usb_create_sysfs_intf_files(struct usb_interface *intf)
+void usb_create_sysfs_intf_files(struct usb_interface *intf)
 {
 	struct usb_device *udev = interface_to_usbdev(intf);
 	struct usb_host_interface *alt = intf->cur_altsetting;
-	int retval;
 
 	if (intf->sysfs_files_created || intf->unregistering)
 		return 0;
@@ -855,9 +854,9 @@ int usb_create_sysfs_intf_files(struct usb_interface *intf)
 			!(udev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
 		alt->string = usb_cache_string(udev, alt->desc.iInterface);
 	if (alt->string)
-		retval = device_create_file(&intf->dev, &dev_attr_interface);
+		/* We don't care if the function actually fails. */
+		device_create_file(&intf->dev, &dev_attr_interface);
 	intf->sysfs_files_created = 1;
-	return 0;
 }
 
 void usb_remove_sysfs_intf_files(struct usb_interface *intf)
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 079cb57..08b74f8 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -948,8 +948,7 @@ static int usb_bus_notify(struct notifier_block *nb, unsigned long action,
 		if (dev->type == &usb_device_type)
 			(void) usb_create_sysfs_dev_files(to_usb_device(dev));
 		else if (dev->type == &usb_if_device_type)
-			(void) usb_create_sysfs_intf_files(
-					to_usb_interface(dev));
+			usb_create_sysfs_intf_files(to_usb_interface(dev));
 		break;
 
 	case BUS_NOTIFY_DEL_DEVICE:
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index a9cf484..d51ab6a 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -4,7 +4,7 @@
 
 extern int usb_create_sysfs_dev_files(struct usb_device *dev);
 extern void usb_remove_sysfs_dev_files(struct usb_device *dev);
-extern int usb_create_sysfs_intf_files(struct usb_interface *intf);
+extern void usb_create_sysfs_intf_files(struct usb_interface *intf);
 extern void usb_remove_sysfs_intf_files(struct usb_interface *intf);
 extern int usb_create_ep_devs(struct device *parent,
 				struct usb_host_endpoint *endpoint,
-- 
1.7.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/