libnvdimm/namespace: Fix a signedness bug in __holder_class_store()
Subsystems (2)
PATCH 1/1 libnvdimm/namespace: Fix a signedness bug in __holder_class_store()
The "ndns->claim_class" variable is an enum but in this case GCC will treat it as an unsigned int so the error handling is never triggered.
--- drivers/nvdimm/namespace_devs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvdimm/namespace_devs.c +1 -1
@@ -1529,7 +1529,7 @@ static ssize_t __holder_class_store(struct device *dev, const char *buf)return -EINVAL ;/* btt_claim_class() could've returned an error */ -if (ndns->claim_class <0 ) +if ((int )ndns->claim_class <0 )return ndns->claim_class;return 0 ;
Signature · 1 line
2.20.1
Verma, Vishal L
maintainerT24gV2VkLCAyMDE5LTA5LTI1IGF0IDE0OjAwICswMzAwLCBEYW4gQ2FycGVudGVyIHdyb3RlOg0K PiBUaGUgIm5kbnMtPmNsYWltX2NsYXNzIiB2YXJpYWJsZSBpcyBhbiBlbnVtIGJ1dCBpbiB0aGlz IGNhc2UgR0NDIHdpbGwNCj4gdHJlYXQgaXQgYXMgYW4gdW5zaWduZWQgaW50IHNvIHRoZSBlcnJv ciBoYW5kbGluZyBpcyBuZXZlciB0cmlnZ2VyZWQuDQo+IA0KPiBGaXhlczogMTRlNDk0NTQyNjM2 ICgibGlibnZkaW1tLCBidHQ6IEJUVCB1cGRhdGVzIGZvciBVRUZJIDIuNyBmb3JtYXQiKQ0KPiBT aWduZWQtb2ZmLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+DQo+ IC0tLQ0KPiAgZHJpdmVycy9udmRpbW0vbmFtZXNwYWNlX2RldnMuYyB8IDIgKy0NCj4gIDEgZmls ZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQ0KPiANCj4gZGlmZiAtLWdp dCBhL2RyaXZlcnMvbnZkaW1tL25hbWVzcGFjZV9kZXZzLmMgYi9kcml2ZXJzL252ZGltbS9uYW1l c3BhY2VfZGV2cy5jDQo+IGluZGV4IGNjYTBhM2JhMWQyYy4uNjY5OTg1NTI3NzE2IDEwMDY0NA0K PiAtLS0gYS9kcml2ZXJzL252ZGltbS9uYW1lc3BhY2VfZGV2cy5jDQo+ICsrKyBiL2RyaXZlcnMv bnZkaW1tL25hbWVzcGFjZV9kZXZzLmMNCj4gQEAgLTE1MjksNyArMTUyOSw3IEBAIHN0YXRpYyBz c2l6ZV90IF9faG9sZGVyX2NsYXNzX3N0b3JlKHN0cnVjdCBkZXZpY2UgKmRldiwgY29uc3QgY2hh ciAqYnVmKQ0KPiAgCQlyZXR1cm4gLUVJTlZBTDsNCj4gIA0KPiAgCS8qIGJ0dF9jbGFpbV9jbGFz cygpIGNvdWxkJ3ZlIHJldHVybmVkIGFuIGVycm9yICovDQo+IC0JaWYgKG5kbnMtPmNsYWltX2Ns YXNzIDwgMCkNCj4gKwlpZiAoKGludCluZG5zLT5jbGFpbV9jbGFzcyA8IDApDQo+ICAJCXJldHVy biBuZG5zLT5jbGFpbV9jbGFzczsNCj4gIA0KPiAgCXJldHVybiAwOw0KDQpMb29rcyBzdHJhaWdo dGZvcndhcmQsIGFuZCBhIGdvb2QgY2F0Y2guDQpSZXZpZXdlZC1ieTogVmlzaGFsIFZlcm1hIDx2 aXNoYWwubC52ZXJtYUBpbnRlbC5jb20+DQoNCg0K
PiANCj4gT24gV2VkLCAyMDE5LTA5LTI1IGF0IDE0OjAwICswMzAwLCBEYW4gQ2FycGVudGVyIHdy b3RlOg0KPiA+IFRoZSAibmRucy0+Y2xhaW1fY2xhc3MiIHZhcmlhYmxlIGlzIGFuIGVudW0gYnV0 IGluIHRoaXMgY2FzZSBHQ0Mgd2lsbA0KPiA+IHRyZWF0IGl0IGFzIGFuIHVuc2lnbmVkIGludCBz byB0aGUgZXJyb3IgaGFuZGxpbmcgaXMgbmV2ZXIgdHJpZ2dlcmVkLg0KPiA+DQo+ID4gRml4ZXM6 IDE0ZTQ5NDU0MjYzNiAoImxpYm52ZGltbSwgYnR0OiBCVFQgdXBkYXRlcyBmb3IgVUVGSSAyLjcN Cj4gPiBmb3JtYXQiKQ0KPiA+IFNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJw ZW50ZXJAb3JhY2xlLmNvbT4NCj4gPiAtLS0NCj4gPiAgZHJpdmVycy9udmRpbW0vbmFtZXNwYWNl X2RldnMuYyB8IDIgKy0NCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRl bGV0aW9uKC0pDQo+ID4NCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9udmRpbW0vbmFtZXNwYWNl X2RldnMuYw0KPiA+IGIvZHJpdmVycy9udmRpbW0vbmFtZXNwYWNlX2RldnMuYyBpbmRleCBjY2Ew YTNiYTFkMmMuLjY2OTk4NTUyNzcxNg0KPiA+IDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvbnZk aW1tL25hbWVzcGFjZV9kZXZzLmMNCj4gPiArKysgYi9kcml2ZXJzL252ZGltbS9uYW1lc3BhY2Vf ZGV2cy5jDQo+ID4gQEAgLTE1MjksNyArMTUyOSw3IEBAIHN0YXRpYyBzc2l6ZV90IF9faG9sZGVy X2NsYXNzX3N0b3JlKHN0cnVjdCBkZXZpY2UNCj4gKmRldiwgY29uc3QgY2hhciAqYnVmKQ0KPiA+ ICAJCXJldHVybiAtRUlOVkFMOw0KPiA+DQo+ID4gIAkvKiBidHRfY2xhaW1fY2xhc3MoKSBjb3Vs ZCd2ZSByZXR1cm5lZCBhbiBlcnJvciAqLw0KPiA+IC0JaWYgKG5kbnMtPmNsYWltX2NsYXNzIDwg MCkNCj4gPiArCWlmICgoaW50KW5kbnMtPmNsYWltX2NsYXNzIDwgMCkNCj4gPiAgCQlyZXR1cm4g bmRucy0+Y2xhaW1fY2xhc3M7DQo+ID4NCj4gPiAgCXJldHVybiAwOw0KPiANCj4gTG9va3Mgc3Ry YWlnaHRmb3J3YXJkLCBhbmQgYSBnb29kIGNhdGNoLg0KPiBSZXZpZXdlZC1ieTogVmlzaGFsIFZl cm1hIDx2aXNoYWwubC52ZXJtYUBpbnRlbC5jb20+DQoNCkknbSBub3Qgc3VyZSB0aGlzIGlzIHJl YWxseSBhIGdvb2QgZml4LiAgVGhpcyBsZWF2ZXMgbmRucy0+Y2xhaW1fY2xhc3Mgc2V0IHRvIGFu IGludmFsaWQgdmFsdWUuICBJcyB0aGF0IG9rPw0KDQpJcmENCg0K
Verma, Vishal L
maintainerT24gV2VkLCAyMDE5LTA5LTI1IGF0IDExOjI1IC0wNjAwLCBXZWlueSwgSXJhIHdyb3RlOg0KPiA+ IE9uIFdlZCwgMjAxOS0wOS0yNSBhdCAxNDowMCArMDMwMCwgRGFuIENhcnBlbnRlciB3cm90ZToN Cj4gPiA+IFRoZSAibmRucy0+Y2xhaW1fY2xhc3MiIHZhcmlhYmxlIGlzIGFuIGVudW0gYnV0IGlu IHRoaXMgY2FzZSBHQ0Mgd2lsbA0KPiA+ID4gdHJlYXQgaXQgYXMgYW4gdW5zaWduZWQgaW50IHNv IHRoZSBlcnJvciBoYW5kbGluZyBpcyBuZXZlciB0cmlnZ2VyZWQuDQo+ID4gPiANCj4gPiA+IEZp eGVzOiAxNGU0OTQ1NDI2MzYgKCJsaWJudmRpbW0sIGJ0dDogQlRUIHVwZGF0ZXMgZm9yIFVFRkkg Mi43DQo+ID4gPiBmb3JtYXQiKQ0KPiA+ID4gU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8 ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPg0KPiA+ID4gLS0tDQo+ID4gPiAgZHJpdmVycy9udmRp bW0vbmFtZXNwYWNlX2RldnMuYyB8IDIgKy0NCj4gPiA+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNl cnRpb24oKyksIDEgZGVsZXRpb24oLSkNCj4gPiA+IA0KPiA+ID4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvbnZkaW1tL25hbWVzcGFjZV9kZXZzLmMNCj4gPiA+IGIvZHJpdmVycy9udmRpbW0vbmFtZXNw YWNlX2RldnMuYyBpbmRleCBjY2EwYTNiYTFkMmMuLjY2OTk4NTUyNzcxNg0KPiA+ID4gMTAwNjQ0 DQo+ID4gPiAtLS0gYS9kcml2ZXJzL252ZGltbS9uYW1lc3BhY2VfZGV2cy5jDQo+ID4gPiArKysg Yi9kcml2ZXJzL252ZGltbS9uYW1lc3BhY2VfZGV2cy5jDQo+ID4gPiBAQCAtMTUyOSw3ICsxNTI5 LDcgQEAgc3RhdGljIHNzaXplX3QgX19ob2xkZXJfY2xhc3Nfc3RvcmUoc3RydWN0IGRldmljZQ0K PiA+ICpkZXYsIGNvbnN0IGNoYXIgKmJ1ZikNCj4gPiA+ICAJCXJldHVybiAtRUlOVkFMOw0KPiA+ ID4gDQo+ID4gPiAgCS8qIGJ0dF9jbGFpbV9jbGFzcygpIGNvdWxkJ3ZlIHJldHVybmVkIGFuIGVy cm9yICovDQo+ID4gPiAtCWlmIChuZG5zLT5jbGFpbV9jbGFzcyA8IDApDQo+ID4gPiArCWlmICgo aW50KW5kbnMtPmNsYWltX2NsYXNzIDwgMCkNCj4gPiA+ICAJCXJldHVybiBuZG5zLT5jbGFpbV9j bGFzczsNCj4gPiA+IA0KPiA+ID4gIAlyZXR1cm4gMDsNCj4gPiANCj4gPiBMb29rcyBzdHJhaWdo dGZvcndhcmQsIGFuZCBhIGdvb2QgY2F0Y2guDQo+ID4gUmV2aWV3ZWQtYnk6IFZpc2hhbCBWZXJt YSA8dmlzaGFsLmwudmVybWFAaW50ZWwuY29tPg0KPiANCj4gSSdtIG5vdCBzdXJlIHRoaXMgaXMg cmVhbGx5IGEgZ29vZCBmaXguICBUaGlzIGxlYXZlcyBuZG5zLT5jbGFpbV9jbGFzcyBzZXQgdG8g YW4gaW52YWxpZCB2YWx1ZS4gIElzIHRoYXQgb2s/DQo+IA0KDQpIbSwgaXQgaXMganVzdCBpbiBh IHN0b3JlIG9wZXJhdGlvbiBmb3IgdGhlIGhvbGRlcl9jbGFzcyBzeXNmcw0KYXR0cmlidXRlLiBp ZiBjbGFpbV9jbGFzcyB3YXMgbmVnYXRpdmUsIHRoYXQgc3RvcmUgd2lsbCBqdXN0IGZhaWwuDQoN CkZyb20gdGhlIHVzZXJzcGFjZSBzaWRlLCB0aGlzIG1lYW5zIHRoZSAnbW9kZScgZW5mb3JjZW1l bnQgQVBJIHdpbGwNCmZhaWwuIFR5cGljYWxseSwgJ25kY3RsJyBkb2Vzbid0IHJlcXVpcmUgdGhl IGVuZm9yY2VtZW50IHRvIHN1Y2NlZWQsDQpzaW5jZSB3ZSBjYW4gZGlzYW1iaWd1YXRlIG5hbWVz cGFjZXMgZXZlbiB3aXRob3V0IGl0LCBzbyBpdCBkb2Vzbid0DQpibG9jayBuYW1lc3BhY2UgY3Jl YXRpb24gZXRjLg0KDQpPbiB0aGUga2VybmVsIHNpZGUsIGNsYWltX2NsYXNzIGdldHMgdXNlZCBi eSBidHRfZGV2cy5jIGR1cmluZyBwcm9iZSwNCmFuZCBsb29rcyBsaWtlIHRoaXMgY2FzZSwgYXMg aXQgY3VycmVudGx5IHN0YW5kcywgd291bGQgZmFpbCB0aGUgQlRUDQpwcm9iZSAobmRfYnR0X3By b2JlKCkpLiBJIHRoaW5rIHRoaXMgaXMgd2hhdCB3ZSB3YW50Pw0KDQpJIGd1ZXNzIGl0IGNhbiBi ZSBtYWRlIGEgYml0IGNsZWFyZXIgYnkgc3RvcmluZyBOVkRJTU1fQ0NMQVNTX1VOS05PV04NCmV4 cGxpY2l0bHkgaW4gaG9sZGVyX2NsYXNzX3N0b3JlKCksIGJ1dCB0aGF0IGNhbiBiZSBhIHNlcGFy YXRlDQppbXByb3ZlbWVudCBmcm9tIHdoYXQgdGhpcyBwYXRjaCBpcyBhZGRyZXNzaW5nLg0K
Quoted 42 lines · Vishal Verma
Quoted 25 lines · Ira
Quoted 25 lines · Dan Carpenter
drivers/nvdimm/namespace_devs.c static ssize_t __holder_class_store(struct device
Quoted 16 lines
The "
ndns->claim_class" variable is an enum but in this case GCC will treat it as an unsigned int so the error handling is never triggered.Fixes 14e494542636 ("libnvdimm, btt: BTT updates for UEFI 2.7format")
Signed-off-by Dan Carpenter <[email protected]>--- drivers/nvdimm/namespace_devs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/nvdimm/namespace_devs.cindex cca0a3ba1d2c..669985527716 100644drivers/nvdimm/namespace_devs.c +0
-0@@ -1529,7 +1529,7 @@ static ssize_t __holder_class_store(struct device*dev, const char *buf)
Quoted 7 lines
drivers/nvdimm/namespace_devs.c +1
-1return -EINVAL ;/* btt_claim_class() could've returned an error */ -if (ndns->claim_class <0 ) +if ((int )ndns->claim_class <0 )return ndns->claim_class;Quoted 7 lines
Quoted 4 lines
drivers/nvdimm/namespace_devs.c static ssize_t __holder_class_store(struct device *dev, const char *buf) · line 1535
Quoted 1 line
drivers/nvdimm/namespace_devs.c +0
-0return 0 ;Looks straightforward, and a good catch.
Reviewed-by Vishal Verma <[email protected]>I'm not sure this is really a good fix. This leaves
ndns->claim_classset to an invalid value. Is that ok?Hm, it is just in a store operation for the
holder_classsysfs attribute. ifclaim_classwas negative, that store will just fail.From the userspace side, this means the 'mode' enforcement API will fail. Typically, 'ndctl' doesn't require the enforcement to succeed, since we can disambiguate namespaces even without it, so it doesn't block namespace creation etc.
Quoted 7 lines
On the kernel side,
claim_classgets used bybtt_devs.cduring probe, and looks like this case, as it currently stands, would fail the BTT probe (nd_btt_probe()). I think this is what we want?I guess it can be made a bit clearer by storing
NVDIMM_CCLASS_UNKNOWNexplicitly inholder_class_store(), but that can be a separate improvement from what this patch is addressing.
Fair enough I've sent a follow on patch.
Thanks,
Ira