linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iio: hid-sensor-attributes: Check sample_frequency/hysteresis write data legitimacy
@ 2016-11-03  0:45 Song Hongyan
  2016-11-04 17:55 ` Pandruvada, Srinivas
  0 siblings, 1 reply; 4+ messages in thread
From: Song Hongyan @ 2016-11-03  0:45 UTC (permalink / raw)
  To: linux-iio; +Cc: srinivas.pandruvada, Song Hongyan

Neither sample frequency value nor hysteresis value can be set to be a
negative number, check and return "Invalid argument" if they are negative.

If not do this change, sample_frequency will be set into some unknown
value, read hysteresis value after write negative number will return
"Invalid argument".

Signed-off-by: Song Hongyan <hongyan.song@intel.com>
---
 drivers/iio/common/hid-sensors/hid-sensor-attributes.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
index dc33c1d..4509f8475 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
@@ -201,7 +201,7 @@ int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
 	int ret;
 
 	if (val1 < 0 || val2 < 0)
-		ret = -EINVAL;
+		return -EINVAL;
 
 	value = val1 * pow_10(6) + val2;
 	if (value) {
@@ -250,6 +250,9 @@ int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
 	s32 value;
 	int ret;
 
+	if (val1 < 0 || val2 < 0)
+		return -EINVAL;
+
 	value = convert_to_vtf_format(st->sensitivity.size,
 				st->sensitivity.unit_expo,
 				val1, val2);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] iio: hid-sensor-attributes: Check sample_frequency/hysteresis write data legitimacy
  2016-11-03  0:45 [PATCH] iio: hid-sensor-attributes: Check sample_frequency/hysteresis write data legitimacy Song Hongyan
@ 2016-11-04 17:55 ` Pandruvada, Srinivas
  2016-11-05 16:32   ` Jonathan Cameron
  0 siblings, 1 reply; 4+ messages in thread
From: Pandruvada, Srinivas @ 2016-11-04 17:55 UTC (permalink / raw)
  To: Song, Hongyan, linux-iio@vger.kernel.org

T24gVGh1LCAyMDE2LTExLTAzIGF0IDAwOjQ1ICswMDAwLCBTb25nIEhvbmd5YW4gd3JvdGU6DQo+
IA0KPiBOZWl0aGVyIHNhbXBsZSBmcmVxdWVuY3kgdmFsdWUgbm9yIGh5c3RlcmVzaXMgdmFsdWUg
Y2FuIGJlIHNldCB0byBiZQ0KPiBhDQo+IG5lZ2F0aXZlIG51bWJlciwgY2hlY2sgYW5kIHJldHVy
biAiSW52YWxpZCBhcmd1bWVudCIgaWYgdGhleSBhcmUNCj4gbmVnYXRpdmUuDQo+IA0KPiBJZiBu
b3QgZG8gdGhpcyBjaGFuZ2UsIHNhbXBsZV9mcmVxdWVuY3kgd2lsbCBiZSBzZXQgaW50byBzb21l
IHVua25vd24NCj4gdmFsdWUsIHJlYWQgaHlzdGVyZXNpcyB2YWx1ZSBhZnRlciB3cml0ZSBuZWdh
dGl2ZSBudW1iZXIgd2lsbCByZXR1cm4NCj4gIkludmFsaWQgYXJndW1lbnQiLg0KPiANCj4gU2ln
bmVkLW9mZi1ieTogU29uZyBIb25neWFuIDxob25neWFuLnNvbmdAaW50ZWwuY29tPg0KQWNrZWQt
Ynk6IFNyaW5pdmFzIFBhbmRydXZhZGEgPHNyaW5pdmFzLnBhbmRydXZhZGFAbGludXguaW50ZWwu
Y29tPg0KDQo+IA0KPiAtLS0NCj4gwqBkcml2ZXJzL2lpby9jb21tb24vaGlkLXNlbnNvcnMvaGlk
LXNlbnNvci1hdHRyaWJ1dGVzLmMgfCA1ICsrKystDQo+IMKgMSBmaWxlIGNoYW5nZWQsIDQgaW5z
ZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQ0KPiANCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvaWlv
L2NvbW1vbi9oaWQtc2Vuc29ycy9oaWQtc2Vuc29yLWF0dHJpYnV0ZXMuYw0KPiBiL2RyaXZlcnMv
aWlvL2NvbW1vbi9oaWQtc2Vuc29ycy9oaWQtc2Vuc29yLWF0dHJpYnV0ZXMuYw0KPiBpbmRleCBk
YzMzYzFkLi40NTA5Zjg0NzUgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvaWlvL2NvbW1vbi9oaWQt
c2Vuc29ycy9oaWQtc2Vuc29yLWF0dHJpYnV0ZXMuYw0KPiArKysgYi9kcml2ZXJzL2lpby9jb21t
b24vaGlkLXNlbnNvcnMvaGlkLXNlbnNvci1hdHRyaWJ1dGVzLmMNCj4gQEAgLTIwMSw3ICsyMDEs
NyBAQCBpbnQgaGlkX3NlbnNvcl93cml0ZV9zYW1wX2ZyZXFfdmFsdWUoc3RydWN0DQo+IGhpZF9z
ZW5zb3JfY29tbW9uICpzdCwNCj4gwqAJaW50IHJldDsNCj4gwqANCj4gwqAJaWYgKHZhbDEgPCAw
IHx8IHZhbDIgPCAwKQ0KPiAtCQlyZXQgPSAtRUlOVkFMOw0KPiArCQlyZXR1cm4gLUVJTlZBTDsN
Cj4gwqANCj4gwqAJdmFsdWUgPSB2YWwxICogcG93XzEwKDYpICsgdmFsMjsNCj4gwqAJaWYgKHZh
bHVlKSB7DQo+IEBAIC0yNTAsNiArMjUwLDkgQEAgaW50IGhpZF9zZW5zb3Jfd3JpdGVfcmF3X2h5
c3RfdmFsdWUoc3RydWN0DQo+IGhpZF9zZW5zb3JfY29tbW9uICpzdCwNCj4gwqAJczMyIHZhbHVl
Ow0KPiDCoAlpbnQgcmV0Ow0KPiDCoA0KPiArCWlmICh2YWwxIDwgMCB8fCB2YWwyIDwgMCkNCj4g
KwkJcmV0dXJuIC1FSU5WQUw7DQo+ICsNCj4gwqAJdmFsdWUgPSBjb252ZXJ0X3RvX3Z0Zl9mb3Jt
YXQoc3QtPnNlbnNpdGl2aXR5LnNpemUsDQo+IMKgCQkJCXN0LT5zZW5zaXRpdml0eS51bml0X2V4
cG8sDQo+IMKgCQkJCXZhbDEsIHZhbDIpOw==

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] iio: hid-sensor-attributes: Check sample_frequency/hysteresis write data legitimacy
  2016-11-04 17:55 ` Pandruvada, Srinivas
@ 2016-11-05 16:32   ` Jonathan Cameron
  2016-11-05 16:36     ` Pandruvada, Srinivas
  0 siblings, 1 reply; 4+ messages in thread
From: Jonathan Cameron @ 2016-11-05 16:32 UTC (permalink / raw)
  To: Pandruvada, Srinivas, Song, Hongyan, linux-iio@vger.kernel.org

On 04/11/16 17:55, Pandruvada, Srinivas wrote:
> On Thu, 2016-11-03 at 00:45 +0000, Song Hongyan wrote:
>>
>> Neither sample frequency value nor hysteresis value can be set to be
>> a
>> negative number, check and return "Invalid argument" if they are
>> negative.
>>
>> If not do this change, sample_frequency will be set into some unknown
>> value, read hysteresis value after write negative number will return
>> "Invalid argument".
>>
>> Signed-off-by: Song Hongyan <hongyan.song@intel.com>
> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
>From the description I'm reading this as a minor issue and not a
regression (it never worked right).  As such with Linus getting
irritated about fixes for stuff that has been long broken I'm
going to take this the slow route (i.e. next merge window).

Applied to the togreg branch of iio.git. Will be initially pushed out
as testing for the autobuilders to play with it.

Thanks,

Jonathan
> 
>>
>> ---
>>  drivers/iio/common/hid-sensors/hid-sensor-attributes.c | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
>> b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
>> index dc33c1d..4509f8475 100644
>> --- a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
>> +++ b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
>> @@ -201,7 +201,7 @@ int hid_sensor_write_samp_freq_value(struct
>> hid_sensor_common *st,
>>  	int ret;
>>  
>>  	if (val1 < 0 || val2 < 0)
>> -		ret = -EINVAL;
>> +		return -EINVAL;
>>  
>>  	value = val1 * pow_10(6) + val2;
>>  	if (value) {
>> @@ -250,6 +250,9 @@ int hid_sensor_write_raw_hyst_value(struct
>> hid_sensor_common *st,
>>  	s32 value;
>>  	int ret;
>>  
>> +	if (val1 < 0 || val2 < 0)
>> +		return -EINVAL;
>> +
>>  	value = convert_to_vtf_format(st->sensitivity.size,
>>  				st->sensitivity.unit_expo,
>>  				val1, val2);N�����r��y���b�X��ǧv�^�)޺{.n�+����{��*"��^n�r���z�\x1a��h����&��\x1e�G���h�\x03(�階�ݢj"��\x1a�^[m�����z�ޖ���f���h���~�mml==


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] iio: hid-sensor-attributes: Check sample_frequency/hysteresis write data legitimacy
  2016-11-05 16:32   ` Jonathan Cameron
@ 2016-11-05 16:36     ` Pandruvada, Srinivas
  0 siblings, 0 replies; 4+ messages in thread
From: Pandruvada, Srinivas @ 2016-11-05 16:36 UTC (permalink / raw)
  To: Song, Hongyan, linux-iio@vger.kernel.org, jic23@kernel.org

T24gU2F0LCAyMDE2LTExLTA1IGF0IDE2OjMyICswMDAwLCBKb25hdGhhbiBDYW1lcm9uIHdyb3Rl
Og0KPiBPbiAwNC8xMS8xNiAxNzo1NSwgUGFuZHJ1dmFkYSwgU3Jpbml2YXMgd3JvdGU6DQo+ID4g
DQo+ID4gT24gVGh1LCAyMDE2LTExLTAzIGF0IDAwOjQ1ICswMDAwLCBTb25nIEhvbmd5YW4gd3Jv
dGU6DQo+ID4gPiANCj4gPiA+IA0KPiA+ID4gTmVpdGhlciBzYW1wbGUgZnJlcXVlbmN5IHZhbHVl
IG5vciBoeXN0ZXJlc2lzIHZhbHVlIGNhbiBiZSBzZXQgdG8NCj4gPiA+IGJlDQo+ID4gPiBhDQo+
ID4gPiBuZWdhdGl2ZSBudW1iZXIsIGNoZWNrIGFuZCByZXR1cm4gIkludmFsaWQgYXJndW1lbnQi
IGlmIHRoZXkgYXJlDQo+ID4gPiBuZWdhdGl2ZS4NCj4gPiA+IA0KPiA+ID4gSWYgbm90IGRvIHRo
aXMgY2hhbmdlLCBzYW1wbGVfZnJlcXVlbmN5IHdpbGwgYmUgc2V0IGludG8gc29tZQ0KPiA+ID4g
dW5rbm93bg0KPiA+ID4gdmFsdWUsIHJlYWQgaHlzdGVyZXNpcyB2YWx1ZSBhZnRlciB3cml0ZSBu
ZWdhdGl2ZSBudW1iZXIgd2lsbA0KPiA+ID4gcmV0dXJuDQo+ID4gPiAiSW52YWxpZCBhcmd1bWVu
dCIuDQo+ID4gPiANCj4gPiA+IFNpZ25lZC1vZmYtYnk6IFNvbmcgSG9uZ3lhbiA8aG9uZ3lhbi5z
b25nQGludGVsLmNvbT4NCj4gPiBBY2tlZC1ieTogU3Jpbml2YXMgUGFuZHJ1dmFkYSA8c3Jpbml2
YXMucGFuZHJ1dmFkYUBsaW51eC5pbnRlbC5jb20+DQo+IEZyb20gdGhlIGRlc2NyaXB0aW9uIEkn
bSByZWFkaW5nIHRoaXMgYXMgYSBtaW5vciBpc3N1ZSBhbmQgbm90IGENCj4gcmVncmVzc2lvbiAo
aXQgbmV2ZXIgd29ya2VkIHJpZ2h0KS7CoMKgQXMgc3VjaCB3aXRoIExpbnVzIGdldHRpbmcNCj4g
aXJyaXRhdGVkIGFib3V0IGZpeGVzIGZvciBzdHVmZiB0aGF0IGhhcyBiZWVuIGxvbmcgYnJva2Vu
IEknbQ0KPiBnb2luZyB0byB0YWtlIHRoaXMgdGhlIHNsb3cgcm91dGUgKGkuZS4gbmV4dCBtZXJn
ZSB3aW5kb3cpLg0KPiANClRoaXMgaXMgZmluZS4gVGhpcyBpcyBub3QgdXJnZW50IGZpeC4NCg0K
VGhhbmtzLA0KU3Jpbml2YXMNCg0KDQoNCj4gQXBwbGllZCB0byB0aGUgdG9ncmVnIGJyYW5jaCBv
ZiBpaW8uZ2l0LiBXaWxsIGJlIGluaXRpYWxseSBwdXNoZWQgb3V0DQo+IGFzIHRlc3RpbmcgZm9y
IHRoZSBhdXRvYnVpbGRlcnMgdG8gcGxheSB3aXRoIGl0Lg0KPiANCj4gVGhhbmtzLA0KPiANCj4g
Sm9uYXRoYW4NCj4gPiANCj4gPiANCj4gPiA+IA0KPiA+ID4gDQo+ID4gPiAtLS0NCj4gPiA+IMKg
ZHJpdmVycy9paW8vY29tbW9uL2hpZC1zZW5zb3JzL2hpZC1zZW5zb3ItYXR0cmlidXRlcy5jIHwg
NSArKysrLQ0KPiA+ID4gwqAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAxIGRlbGV0
aW9uKC0pDQo+ID4gPiANCj4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2lpby9jb21tb24vaGlk
LXNlbnNvcnMvaGlkLXNlbnNvci0NCj4gPiA+IGF0dHJpYnV0ZXMuYw0KPiA+ID4gYi9kcml2ZXJz
L2lpby9jb21tb24vaGlkLXNlbnNvcnMvaGlkLXNlbnNvci1hdHRyaWJ1dGVzLmMNCj4gPiA+IGlu
ZGV4IGRjMzNjMWQuLjQ1MDlmODQ3NSAxMDA2NDQNCj4gPiA+IC0tLSBhL2RyaXZlcnMvaWlvL2Nv
bW1vbi9oaWQtc2Vuc29ycy9oaWQtc2Vuc29yLWF0dHJpYnV0ZXMuYw0KPiA+ID4gKysrIGIvZHJp
dmVycy9paW8vY29tbW9uL2hpZC1zZW5zb3JzL2hpZC1zZW5zb3ItYXR0cmlidXRlcy5jDQo+ID4g
PiBAQCAtMjAxLDcgKzIwMSw3IEBAIGludCBoaWRfc2Vuc29yX3dyaXRlX3NhbXBfZnJlcV92YWx1
ZShzdHJ1Y3QNCj4gPiA+IGhpZF9zZW5zb3JfY29tbW9uICpzdCwNCj4gPiA+IMKgCWludCByZXQ7
DQo+ID4gPiDCoA0KPiA+ID4gwqAJaWYgKHZhbDEgPCAwIHx8IHZhbDIgPCAwKQ0KPiA+ID4gLQkJ
cmV0ID0gLUVJTlZBTDsNCj4gPiA+ICsJCXJldHVybiAtRUlOVkFMOw0KPiA+ID4gwqANCj4gPiA+
IMKgCXZhbHVlID0gdmFsMSAqIHBvd18xMCg2KSArIHZhbDI7DQo+ID4gPiDCoAlpZiAodmFsdWUp
IHsNCj4gPiA+IEBAIC0yNTAsNiArMjUwLDkgQEAgaW50IGhpZF9zZW5zb3Jfd3JpdGVfcmF3X2h5
c3RfdmFsdWUoc3RydWN0DQo+ID4gPiBoaWRfc2Vuc29yX2NvbW1vbiAqc3QsDQo+ID4gPiDCoAlz
MzIgdmFsdWU7DQo+ID4gPiDCoAlpbnQgcmV0Ow0KPiA+ID4gwqANCj4gPiA+ICsJaWYgKHZhbDEg
PCAwIHx8IHZhbDIgPCAwKQ0KPiA+ID4gKwkJcmV0dXJuIC1FSU5WQUw7DQo+ID4gPiArDQo+ID4g
PiDCoAl2YWx1ZSA9IGNvbnZlcnRfdG9fdnRmX2Zvcm1hdChzdC0+c2Vuc2l0aXZpdHkuc2l6ZSwN
Cj4gPiA+IMKgCQkJCXN0LT5zZW5zaXRpdml0eS51bml0X2V4cG8sDQo+ID4gPiDCoAkJCQl2YWwx
LA0KPiA+ID4gdmFsMik7Tu+/ve+/ve+/ve+/ve+/vXLvv73vv71577+977+977+9Yu+/vVjvv73v
v73Hp3bvv71e77+9Kd66ey5u77+9K++/ve+/ve+/ve+/vXvvv73vv70qIu+/ve+/vV5u77+9cu+/
ve+/ve+/vXrvv70a77+977+9aO+/ve+/ve+/ve+/vSYNCj4gPiA+IO+/ve+/vR7vv71H77+977+9
77+9aO+/vQMo77+96ZqO77+93aJqIu+/ve+/vRrvv70bbe+/ve+/ve+/ve+/ve+/vXrvv73elu+/
ve+/ve+/vWbvv73vv73vv71o77+977+977+9fu+/vW1tbD09DQo+IA==

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-11-05 16:36 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-03  0:45 [PATCH] iio: hid-sensor-attributes: Check sample_frequency/hysteresis write data legitimacy Song Hongyan
2016-11-04 17:55 ` Pandruvada, Srinivas
2016-11-05 16:32   ` Jonathan Cameron
2016-11-05 16:36     ` Pandruvada, Srinivas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).