[bluetooth-next V2] bluetooth: hci_sysfs: use strict_strtoul instead of simple_strtoul

[bluetooth-next V2] bluetooth: hci_sysfs: use strict_strtoul instead of simple_strtoul

[Tomas Winkler]

use strict_strtoul as suggested by checkpatch.pl

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
V2:
1. more verbose commit message
2. return the error code that was produced by strict_strtoul 

 net/bluetooth/hci_sysfs.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 1a79a6c..dd11d61 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -282,12 +282,12 @@ static ssize_t show_idle_timeout(struct device *dev, struct device_attribute *at
 static ssize_t store_idle_timeout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
 	struct hci_dev *hdev = dev_get_drvdata(dev);
-	char *ptr;
-	__u32 val;
+	unsigned long val;
+	int ret;
 
-	val = simple_strtoul(buf, &ptr, 10);
-	if (ptr == buf)
-		return -EINVAL;
+	ret = strict_strtoul(buf, 0, &val);
+	if (ret)
+		return ret;
 
 	if (val != 0 && (val < 500 || val > 3600000))
 		return -EINVAL;
@@ -306,12 +306,12 @@ static ssize_t show_sniff_max_interval(struct device *dev, struct device_attribu
 static ssize_t store_sniff_max_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
 	struct hci_dev *hdev = dev_get_drvdata(dev);
-	char *ptr;
-	__u16 val;
+	unsigned long val;
+	int ret;
 
-	val = simple_strtoul(buf, &ptr, 10);
-	if (ptr == buf)
-		return -EINVAL;
+	ret = strict_strtoul(buf, 0, &val);
+	if (ret)
+		return ret;
 
 	if (val < 0x0002 || val > 0xFFFE || val % 2)
 		return -EINVAL;
@@ -333,12 +333,12 @@ static ssize_t show_sniff_min_interval(struct device *dev, struct device_attribu
 static ssize_t store_sniff_min_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
 	struct hci_dev *hdev = dev_get_drvdata(dev);
-	char *ptr;
-	__u16 val;
+	unsigned long val;
+	int ret;
 
-	val = simple_strtoul(buf, &ptr, 10);
-	if (ptr == buf)
-		return -EINVAL;
+	ret = strict_strtoul(buf, 0, &val);
+	if (ret)
+		return ret;
 
 	if (val < 0x0002 || val > 0xFFFE || val % 2)
 		return -EINVAL;
-- 
1.6.6.1

---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Re: [bluetooth-next V2] bluetooth: hci_sysfs: use strict_strtoul instead of simple_strtoul

[Marcel Holtmann]

Hi Tomas,

> use strict_strtoul as suggested by checkpatch.pl
> 
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
> V2:
> 1. more verbose commit message
> 2. return the error code that was produced by strict_strtoul 

why do you bother actually. Reading the comment about struct_strtoul it
will only return -EINVAL or 0. So using my proposal would be just fine.
I also don't prefer to differ the return value to user space until it
actually makes sense. Invalid argument is just fine for all error cases.

Regards

Marcel

RE: [bluetooth-next V2] bluetooth: hci_sysfs: use strict_strtoul instead of simple_strtoul

[Winkler, Tomas]

DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogTWFyY2VsIEhvbHRtYW5u
IFttYWlsdG86bWFyY2VsQGhvbHRtYW5uLm9yZ10NCj4gU2VudDogVHVlc2RheSwgTWFyY2ggMDks
IDIwMTAgMTA6NDIgUE0NCj4gVG86IFdpbmtsZXIsIFRvbWFzDQo+IENjOiBsaW51eC1ibHVldG9v
dGhAdmdlci5rZXJuZWwub3JnOyBDb2hlbiwgR3V5OyBSaW5kanVuc2t5LCBSb24NCj4gU3ViamVj
dDogUmU6IFtibHVldG9vdGgtbmV4dCBWMl0gYmx1ZXRvb3RoOiBoY2lfc3lzZnM6IHVzZSBzdHJp
Y3Rfc3RydG91bA0KPiBpbnN0ZWFkIG9mIHNpbXBsZV9zdHJ0b3VsDQo+IA0KPiBIaSBUb21hcywN
Cj4gDQo+ID4gdXNlIHN0cmljdF9zdHJ0b3VsIGFzIHN1Z2dlc3RlZCBieSBjaGVja3BhdGNoLnBs
DQo+ID4NCj4gPiBTaWduZWQtb2ZmLWJ5OiBUb21hcyBXaW5rbGVyIDx0b21hcy53aW5rbGVyQGlu
dGVsLmNvbT4NCj4gPiAtLS0NCj4gPiBWMjoNCj4gPiAxLiBtb3JlIHZlcmJvc2UgY29tbWl0IG1l
c3NhZ2UNCj4gPiAyLiByZXR1cm4gdGhlIGVycm9yIGNvZGUgdGhhdCB3YXMgcHJvZHVjZWQgYnkg
c3RyaWN0X3N0cnRvdWwNCj4gDQo+IHdoeSBkbyB5b3UgYm90aGVyIGFjdHVhbGx5LiBSZWFkaW5n
IHRoZSBjb21tZW50IGFib3V0IHN0cnVjdF9zdHJ0b3VsIGl0DQo+IHdpbGwgb25seSByZXR1cm4g
LUVJTlZBTCBvciAwLiBTbyB1c2luZyBteSBwcm9wb3NhbCB3b3VsZCBiZSBqdXN0IGZpbmUuDQo+
IEkgYWxzbyBkb24ndCBwcmVmZXIgdG8gZGlmZmVyIHRoZSByZXR1cm4gdmFsdWUgdG8gdXNlciBz
cGFjZSB1bnRpbCBpdA0KPiBhY3R1YWxseSBtYWtlcyBzZW5zZS4gSW52YWxpZCBhcmd1bWVudCBp
cyBqdXN0IGZpbmUgZm9yIGFsbCBlcnJvciBjYXNlcy4NCj4NClllcyBJIGtub3cgYnV0IEkndmUg
dXNlIG9mIHRoaXMgb3ZlciB0aGUga2VybmVsIGNvZGUgYW5kIHdoYXQgSSd2ZSB1c2VkIGlzIHRo
ZSBtb3N0bHkgdXNlZCBpZGlvbQ0KDQpUaGFua3MNClRvbWFzDQoNCg0KDQotLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K
SW50ZWwgSXNyYWVsICg3NCkgTGltaXRlZAoKVGhpcyBlLW1haWwgYW5kIGFueSBhdHRhY2htZW50
cyBtYXkgY29udGFpbiBjb25maWRlbnRpYWwgbWF0ZXJpYWwgZm9yCnRoZSBzb2xlIHVzZSBvZiB0
aGUgaW50ZW5kZWQgcmVjaXBpZW50KHMpLiBBbnkgcmV2aWV3IG9yIGRpc3RyaWJ1dGlvbgpieSBv
dGhlcnMgaXMgc3RyaWN0bHkgcHJvaGliaXRlZC4gSWYgeW91IGFyZSBub3QgdGhlIGludGVuZGVk
CnJlY2lwaWVudCwgcGxlYXNlIGNvbnRhY3QgdGhlIHNlbmRlciBhbmQgZGVsZXRlIGFsbCBjb3Bp
ZXMuCg==

RE: [bluetooth-next V2] bluetooth: hci_sysfs: use strict_strtoul instead of simple_strtoul

[Marcel Holtmann]

Hi Tomas,

> > > use strict_strtoul as suggested by checkpatch.pl
> > >
> > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > > ---
> > > V2:
> > > 1. more verbose commit message
> > > 2. return the error code that was produced by strict_strtoul
> > 
> > why do you bother actually. Reading the comment about struct_strtoul it
> > will only return -EINVAL or 0. So using my proposal would be just fine.
> > I also don't prefer to differ the return value to user space until it
> > actually makes sense. Invalid argument is just fine for all error cases.
> >
> Yes I know but I've use of this over the kernel code and what I've used is the mostly used idiom

I choose to have it as I originally proposed. Patch has been pushed into
bluetooth-testing tree.

Regards

Marcel