From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: Re: [PATCH v1 10/10] efivars: use generic UUID library Date: Fri, 26 Feb 2016 16:29:11 +0200 Message-ID: <1456496951.13244.147.camel@linux.intel.com> References: <1455711448-124103-1-git-send-email-andriy.shevchenko@linux.intel.com> <1455711448-124103-11-git-send-email-andriy.shevchenko@linux.intel.com> <20160218150727.GK2651@codeblueprint.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20160218150727.GK2651@codeblueprint.co.uk> Sender: linux-acpi-owner@vger.kernel.org To: Matt Fleming Cc: "Rafael J. Wysocki" , Theodore Ts'o , Arnd Bergmann , Greg Kroah-Hartman , Jarkko Sakkinen , Jani Nikula , David Airlie , Benjamin Tissoires , Bjorn Helgaas , Mathias Nyman , Lv Zheng , Mark Brown , Zhang Rui , Mika Westerberg , Andrew Morton , Rasmus Villemoes , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-efi@vger.kernel.org, linux-api@vger.kernel.org, linux-nvdimm@lists.01.org List-Id: linux-api@vger.kernel.org On Thu, 2016-02-18 at 15:07 +0000, Matt Fleming wrote: > On Wed, 17 Feb, at 02:17:28PM, Andy Shevchenko wrote: > > Instead of opencoding let's use generic UUID library functions > > here. > >=20 > > Signed-off-by: Andy Shevchenko > > --- > > =C2=A0fs/efivarfs/inode.c | 40 +++---------------------------------= ---- > > =C2=A01 file changed, 3 insertions(+), 37 deletions(-) > >=20 > > diff --git a/fs/efivarfs/inode.c b/fs/efivarfs/inode.c > > index 3381b9d..b579e3a 100644 > > --- a/fs/efivarfs/inode.c > > +++ b/fs/efivarfs/inode.c > > @@ -11,6 +11,7 @@ > > =C2=A0#include > > =C2=A0#include > > =C2=A0#include > > +#include > > =C2=A0 > > =C2=A0#include "internal.h" > > =C2=A0 > > @@ -44,11 +45,7 @@ struct inode *efivarfs_get_inode(struct > > super_block *sb, > > =C2=A0 */ > > =C2=A0bool efivarfs_valid_name(const char *str, int len) > > =C2=A0{ > > - static const char dashes[EFI_VARIABLE_GUID_LEN] =3D { > > - [8] =3D 1, [13] =3D 1, [18] =3D 1, [23] =3D 1 > > - }; > > =C2=A0 const char *s =3D str + len - EFI_VARIABLE_GUID_LEN; > > - int i; > > =C2=A0 > > =C2=A0 /* > > =C2=A0 =C2=A0* We need a GUID, plus at least one letter for the > > variable name, > > @@ -66,37 +63,7 @@ bool efivarfs_valid_name(const char *str, int > > len) > > =C2=A0 =C2=A0* > > =C2=A0 =C2=A0* 12345678-1234-1234-1234-123456789abc > > =C2=A0 =C2=A0*/ > > - for (i =3D 0; i < EFI_VARIABLE_GUID_LEN; i++) { > > - if (dashes[i]) { > > - if (*s++ !=3D '-') > > - return false; > > - } else { > > - if (!isxdigit(*s++)) > > - return false; > > - } > > - } > > - > > - return true; > > -} > > - > > -static void efivarfs_hex_to_guid(const char *str, efi_guid_t > > *guid) > > -{ > > - guid->b[0] =3D hex_to_bin(str[6]) << 4 | hex_to_bin(str[7]); > > - guid->b[1] =3D hex_to_bin(str[4]) << 4 | hex_to_bin(str[5]); > > - guid->b[2] =3D hex_to_bin(str[2]) << 4 | hex_to_bin(str[3]); > > - guid->b[3] =3D hex_to_bin(str[0]) << 4 | hex_to_bin(str[1]); > > - guid->b[4] =3D hex_to_bin(str[11]) << 4 | > > hex_to_bin(str[12]); > > - guid->b[5] =3D hex_to_bin(str[9]) << 4 | > > hex_to_bin(str[10]); > > - guid->b[6] =3D hex_to_bin(str[16]) << 4 | > > hex_to_bin(str[17]); > > - guid->b[7] =3D hex_to_bin(str[14]) << 4 | > > hex_to_bin(str[15]); > > - guid->b[8] =3D hex_to_bin(str[19]) << 4 | > > hex_to_bin(str[20]); > > - guid->b[9] =3D hex_to_bin(str[21]) << 4 | > > hex_to_bin(str[22]); > > - guid->b[10] =3D hex_to_bin(str[24]) << 4 | > > hex_to_bin(str[25]); > > - guid->b[11] =3D hex_to_bin(str[26]) << 4 | > > hex_to_bin(str[27]); > > - guid->b[12] =3D hex_to_bin(str[28]) << 4 | > > hex_to_bin(str[29]); > > - guid->b[13] =3D hex_to_bin(str[30]) << 4 | > > hex_to_bin(str[31]); > > - guid->b[14] =3D hex_to_bin(str[32]) << 4 | > > hex_to_bin(str[33]); > > - guid->b[15] =3D hex_to_bin(str[34]) << 4 | > > hex_to_bin(str[35]); > > + return uuid_is_valid(s); > > =C2=A0} >=20 > I think you've confused yourself here. You've inverted the return > value meaning for efivarfs_valid_name(). >=20 > Normally I would expect this change to be correct but uuid_is_valid() > returns 0 for success, -EINVAL for failure. Either the function is > misnamed or the return value semantics are wrong. Oops, thanks for noticing this. Right the return value should be aligned. --=20 Andy Shevchenko Intel Finland Oy -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ml01.01.org (Postfix) with ESMTP id 279AE1A1DF3 for ; Fri, 26 Feb 2016 06:28:37 -0800 (PST) Message-ID: <1456496951.13244.147.camel@linux.intel.com> Subject: Re: [PATCH v1 10/10] efivars: use generic UUID library From: Andy Shevchenko Date: Fri, 26 Feb 2016 16:29:11 +0200 In-Reply-To: <20160218150727.GK2651@codeblueprint.co.uk> References: <1455711448-124103-1-git-send-email-andriy.shevchenko@linux.intel.com> <1455711448-124103-11-git-send-email-andriy.shevchenko@linux.intel.com> <20160218150727.GK2651@codeblueprint.co.uk> Mime-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Matt Fleming Cc: linux-efi@vger.kernel.org, David Airlie , Rasmus Villemoes , dri-devel@lists.freedesktop.org, Benjamin Tissoires , Lv Zheng , Arnd Bergmann , linux-nvdimm@lists.01.org, linux-acpi@vger.kernel.org, Zhang Rui , Mathias Nyman , Jani Nikula , Mark Brown , Jarkko Sakkinen , Bjorn Helgaas , Mika Westerberg , Theodore Ts'o , Greg Kroah-Hartman , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, Andrew Morton List-ID: T24gVGh1LCAyMDE2LTAyLTE4IGF0IDE1OjA3ICswMDAwLCBNYXR0IEZsZW1pbmcgd3JvdGU6Cj4g T24gV2VkLCAxNyBGZWIsIGF0IDAyOjE3OjI4UE0sIEFuZHkgU2hldmNoZW5rbyB3cm90ZToKPiA+ IEluc3RlYWQgb2Ygb3BlbmNvZGluZyBsZXQncyB1c2UgZ2VuZXJpYyBVVUlEIGxpYnJhcnkgZnVu Y3Rpb25zCj4gPiBoZXJlLgo+ID4gCj4gPiBTaWduZWQtb2ZmLWJ5OiBBbmR5IFNoZXZjaGVua28g PGFuZHJpeS5zaGV2Y2hlbmtvQGxpbnV4LmludGVsLmNvbT4KPiA+IC0tLQo+ID4gwqBmcy9lZml2 YXJmcy9pbm9kZS5jIHwgNDAgKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQo+ID4gwqAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAzNyBkZWxldGlvbnMoLSkK PiA+IAo+ID4gZGlmZiAtLWdpdCBhL2ZzL2VmaXZhcmZzL2lub2RlLmMgYi9mcy9lZml2YXJmcy9p bm9kZS5jCj4gPiBpbmRleCAzMzgxYjlkLi5iNTc5ZTNhIDEwMDY0NAo+ID4gLS0tIGEvZnMvZWZp dmFyZnMvaW5vZGUuYwo+ID4gKysrIGIvZnMvZWZpdmFyZnMvaW5vZGUuYwo+ID4gQEAgLTExLDYg KzExLDcgQEAKPiA+IMKgI2luY2x1ZGUgPGxpbnV4L2ZzLmg+Cj4gPiDCoCNpbmNsdWRlIDxsaW51 eC9jdHlwZS5oPgo+ID4gwqAjaW5jbHVkZSA8bGludXgvc2xhYi5oPgo+ID4gKyNpbmNsdWRlIDxs aW51eC91dWlkLmg+Cj4gPiDCoAo+ID4gwqAjaW5jbHVkZSAiaW50ZXJuYWwuaCIKPiA+IMKgCj4g PiBAQCAtNDQsMTEgKzQ1LDcgQEAgc3RydWN0IGlub2RlICplZml2YXJmc19nZXRfaW5vZGUoc3Ry dWN0Cj4gPiBzdXBlcl9ibG9jayAqc2IsCj4gPiDCoCAqLwo+ID4gwqBib29sIGVmaXZhcmZzX3Zh bGlkX25hbWUoY29uc3QgY2hhciAqc3RyLCBpbnQgbGVuKQo+ID4gwqB7Cj4gPiAtCXN0YXRpYyBj b25zdCBjaGFyIGRhc2hlc1tFRklfVkFSSUFCTEVfR1VJRF9MRU5dID0gewo+ID4gLQkJWzhdID0g MSwgWzEzXSA9IDEsIFsxOF0gPSAxLCBbMjNdID0gMQo+ID4gLQl9Owo+ID4gwqAJY29uc3QgY2hh ciAqcyA9IHN0ciArIGxlbiAtIEVGSV9WQVJJQUJMRV9HVUlEX0xFTjsKPiA+IC0JaW50IGk7Cj4g PiDCoAo+ID4gwqAJLyoKPiA+IMKgCcKgKiBXZSBuZWVkIGEgR1VJRCwgcGx1cyBhdCBsZWFzdCBv bmUgbGV0dGVyIGZvciB0aGUKPiA+IHZhcmlhYmxlIG5hbWUsCj4gPiBAQCAtNjYsMzcgKzYzLDcg QEAgYm9vbCBlZml2YXJmc192YWxpZF9uYW1lKGNvbnN0IGNoYXIgKnN0ciwgaW50Cj4gPiBsZW4p Cj4gPiDCoAnCoCoKPiA+IMKgCcKgKgkxMjM0NTY3OC0xMjM0LTEyMzQtMTIzNC0xMjM0NTY3ODlh YmMKPiA+IMKgCcKgKi8KPiA+IC0JZm9yIChpID0gMDsgaSA8IEVGSV9WQVJJQUJMRV9HVUlEX0xF TjsgaSsrKSB7Cj4gPiAtCQlpZiAoZGFzaGVzW2ldKSB7Cj4gPiAtCQkJaWYgKCpzKysgIT0gJy0n KQo+ID4gLQkJCQlyZXR1cm4gZmFsc2U7Cj4gPiAtCQl9IGVsc2Ugewo+ID4gLQkJCWlmICghaXN4 ZGlnaXQoKnMrKykpCj4gPiAtCQkJCXJldHVybiBmYWxzZTsKPiA+IC0JCX0KPiA+IC0JfQo+ID4g LQo+ID4gLQlyZXR1cm4gdHJ1ZTsKPiA+IC19Cj4gPiAtCj4gPiAtc3RhdGljIHZvaWQgZWZpdmFy ZnNfaGV4X3RvX2d1aWQoY29uc3QgY2hhciAqc3RyLCBlZmlfZ3VpZF90Cj4gPiAqZ3VpZCkKPiA+ IC17Cj4gPiAtCWd1aWQtPmJbMF0gPSBoZXhfdG9fYmluKHN0cls2XSkgPDwgNCB8IGhleF90b19i aW4oc3RyWzddKTsKPiA+IC0JZ3VpZC0+YlsxXSA9IGhleF90b19iaW4oc3RyWzRdKSA8PCA0IHwg aGV4X3RvX2JpbihzdHJbNV0pOwo+ID4gLQlndWlkLT5iWzJdID0gaGV4X3RvX2JpbihzdHJbMl0p IDw8IDQgfCBoZXhfdG9fYmluKHN0clszXSk7Cj4gPiAtCWd1aWQtPmJbM10gPSBoZXhfdG9fYmlu KHN0clswXSkgPDwgNCB8IGhleF90b19iaW4oc3RyWzFdKTsKPiA+IC0JZ3VpZC0+Yls0XSA9IGhl eF90b19iaW4oc3RyWzExXSkgPDwgNCB8Cj4gPiBoZXhfdG9fYmluKHN0clsxMl0pOwo+ID4gLQln dWlkLT5iWzVdID0gaGV4X3RvX2JpbihzdHJbOV0pIDw8IDQgfAo+ID4gaGV4X3RvX2JpbihzdHJb MTBdKTsKPiA+IC0JZ3VpZC0+Yls2XSA9IGhleF90b19iaW4oc3RyWzE2XSkgPDwgNCB8Cj4gPiBo ZXhfdG9fYmluKHN0clsxN10pOwo+ID4gLQlndWlkLT5iWzddID0gaGV4X3RvX2JpbihzdHJbMTRd KSA8PCA0IHwKPiA+IGhleF90b19iaW4oc3RyWzE1XSk7Cj4gPiAtCWd1aWQtPmJbOF0gPSBoZXhf dG9fYmluKHN0clsxOV0pIDw8IDQgfAo+ID4gaGV4X3RvX2JpbihzdHJbMjBdKTsKPiA+IC0JZ3Vp ZC0+Yls5XSA9IGhleF90b19iaW4oc3RyWzIxXSkgPDwgNCB8Cj4gPiBoZXhfdG9fYmluKHN0clsy Ml0pOwo+ID4gLQlndWlkLT5iWzEwXSA9IGhleF90b19iaW4oc3RyWzI0XSkgPDwgNCB8Cj4gPiBo ZXhfdG9fYmluKHN0clsyNV0pOwo+ID4gLQlndWlkLT5iWzExXSA9IGhleF90b19iaW4oc3RyWzI2 XSkgPDwgNCB8Cj4gPiBoZXhfdG9fYmluKHN0clsyN10pOwo+ID4gLQlndWlkLT5iWzEyXSA9IGhl eF90b19iaW4oc3RyWzI4XSkgPDwgNCB8Cj4gPiBoZXhfdG9fYmluKHN0clsyOV0pOwo+ID4gLQln dWlkLT5iWzEzXSA9IGhleF90b19iaW4oc3RyWzMwXSkgPDwgNCB8Cj4gPiBoZXhfdG9fYmluKHN0 clszMV0pOwo+ID4gLQlndWlkLT5iWzE0XSA9IGhleF90b19iaW4oc3RyWzMyXSkgPDwgNCB8Cj4g PiBoZXhfdG9fYmluKHN0clszM10pOwo+ID4gLQlndWlkLT5iWzE1XSA9IGhleF90b19iaW4oc3Ry WzM0XSkgPDwgNCB8Cj4gPiBoZXhfdG9fYmluKHN0clszNV0pOwo+ID4gKwlyZXR1cm4gdXVpZF9p c192YWxpZChzKTsKPiA+IMKgfQo+IAo+IEkgdGhpbmsgeW91J3ZlIGNvbmZ1c2VkIHlvdXJzZWxm IGhlcmUuIFlvdSd2ZSBpbnZlcnRlZCB0aGUgcmV0dXJuCj4gdmFsdWUgbWVhbmluZyBmb3IgZWZp dmFyZnNfdmFsaWRfbmFtZSgpLgo+IAo+IE5vcm1hbGx5IEkgd291bGQgZXhwZWN0IHRoaXMgY2hh bmdlIHRvIGJlIGNvcnJlY3QgYnV0IHV1aWRfaXNfdmFsaWQoKQo+IHJldHVybnMgMCBmb3Igc3Vj Y2VzcywgLUVJTlZBTCBmb3IgZmFpbHVyZS4gRWl0aGVyIHRoZSBmdW5jdGlvbiBpcwo+IG1pc25h bWVkIG9yIHRoZSByZXR1cm4gdmFsdWUgc2VtYW50aWNzIGFyZSB3cm9uZy4KCk9vcHMsIHRoYW5r cyBmb3Igbm90aWNpbmcgdGhpcy4gUmlnaHQgdGhlIHJldHVybiB2YWx1ZSBzaG91bGQgYmUKYWxp Z25lZC4KCi0tIApBbmR5IFNoZXZjaGVua28gPGFuZHJpeS5zaGV2Y2hlbmtvQGxpbnV4LmludGVs LmNvbT4KSW50ZWwgRmlubGFuZCBPeQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KTGludXgtbnZkaW1tIG1haWxpbmcgbGlzdApMaW51eC1udmRpbW1AbGlz dHMuMDEub3JnCmh0dHBzOi8vbGlzdHMuMDEub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtbnZk aW1tCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932957AbcBZO2g (ORCPT ); Fri, 26 Feb 2016 09:28:36 -0500 Received: from mga03.intel.com ([134.134.136.65]:58473 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754100AbcBZO2d (ORCPT ); Fri, 26 Feb 2016 09:28:33 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,498,1449561600"; d="scan'208";a="753772211" Message-ID: <1456496951.13244.147.camel@linux.intel.com> Subject: Re: [PATCH v1 10/10] efivars: use generic UUID library From: Andy Shevchenko To: Matt Fleming Cc: "Rafael J. Wysocki" , "Theodore Ts'o" , Arnd Bergmann , Greg Kroah-Hartman , Jarkko Sakkinen , Jani Nikula , David Airlie , Benjamin Tissoires , Bjorn Helgaas , Mathias Nyman , Lv Zheng , Mark Brown , Zhang Rui , Mika Westerberg , Andrew Morton , Rasmus Villemoes , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-efi@vger.kernel.org, linux-api@vger.kernel.org, linux-nvdimm@ml01.01.org Date: Fri, 26 Feb 2016 16:29:11 +0200 In-Reply-To: <20160218150727.GK2651@codeblueprint.co.uk> References: <1455711448-124103-1-git-send-email-andriy.shevchenko@linux.intel.com> <1455711448-124103-11-git-send-email-andriy.shevchenko@linux.intel.com> <20160218150727.GK2651@codeblueprint.co.uk> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.18.3-1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2016-02-18 at 15:07 +0000, Matt Fleming wrote: > On Wed, 17 Feb, at 02:17:28PM, Andy Shevchenko wrote: > > Instead of opencoding let's use generic UUID library functions > > here. > > > > Signed-off-by: Andy Shevchenko > > --- > >  fs/efivarfs/inode.c | 40 +++------------------------------------- > >  1 file changed, 3 insertions(+), 37 deletions(-) > > > > diff --git a/fs/efivarfs/inode.c b/fs/efivarfs/inode.c > > index 3381b9d..b579e3a 100644 > > --- a/fs/efivarfs/inode.c > > +++ b/fs/efivarfs/inode.c > > @@ -11,6 +11,7 @@ > >  #include > >  #include > >  #include > > +#include > >   > >  #include "internal.h" > >   > > @@ -44,11 +45,7 @@ struct inode *efivarfs_get_inode(struct > > super_block *sb, > >   */ > >  bool efivarfs_valid_name(const char *str, int len) > >  { > > - static const char dashes[EFI_VARIABLE_GUID_LEN] = { > > - [8] = 1, [13] = 1, [18] = 1, [23] = 1 > > - }; > >   const char *s = str + len - EFI_VARIABLE_GUID_LEN; > > - int i; > >   > >   /* > >    * We need a GUID, plus at least one letter for the > > variable name, > > @@ -66,37 +63,7 @@ bool efivarfs_valid_name(const char *str, int > > len) > >    * > >    * 12345678-1234-1234-1234-123456789abc > >    */ > > - for (i = 0; i < EFI_VARIABLE_GUID_LEN; i++) { > > - if (dashes[i]) { > > - if (*s++ != '-') > > - return false; > > - } else { > > - if (!isxdigit(*s++)) > > - return false; > > - } > > - } > > - > > - return true; > > -} > > - > > -static void efivarfs_hex_to_guid(const char *str, efi_guid_t > > *guid) > > -{ > > - guid->b[0] = hex_to_bin(str[6]) << 4 | hex_to_bin(str[7]); > > - guid->b[1] = hex_to_bin(str[4]) << 4 | hex_to_bin(str[5]); > > - guid->b[2] = hex_to_bin(str[2]) << 4 | hex_to_bin(str[3]); > > - guid->b[3] = hex_to_bin(str[0]) << 4 | hex_to_bin(str[1]); > > - guid->b[4] = hex_to_bin(str[11]) << 4 | > > hex_to_bin(str[12]); > > - guid->b[5] = hex_to_bin(str[9]) << 4 | > > hex_to_bin(str[10]); > > - guid->b[6] = hex_to_bin(str[16]) << 4 | > > hex_to_bin(str[17]); > > - guid->b[7] = hex_to_bin(str[14]) << 4 | > > hex_to_bin(str[15]); > > - guid->b[8] = hex_to_bin(str[19]) << 4 | > > hex_to_bin(str[20]); > > - guid->b[9] = hex_to_bin(str[21]) << 4 | > > hex_to_bin(str[22]); > > - guid->b[10] = hex_to_bin(str[24]) << 4 | > > hex_to_bin(str[25]); > > - guid->b[11] = hex_to_bin(str[26]) << 4 | > > hex_to_bin(str[27]); > > - guid->b[12] = hex_to_bin(str[28]) << 4 | > > hex_to_bin(str[29]); > > - guid->b[13] = hex_to_bin(str[30]) << 4 | > > hex_to_bin(str[31]); > > - guid->b[14] = hex_to_bin(str[32]) << 4 | > > hex_to_bin(str[33]); > > - guid->b[15] = hex_to_bin(str[34]) << 4 | > > hex_to_bin(str[35]); > > + return uuid_is_valid(s); > >  } > > I think you've confused yourself here. You've inverted the return > value meaning for efivarfs_valid_name(). > > Normally I would expect this change to be correct but uuid_is_valid() > returns 0 for success, -EINVAL for failure. Either the function is > misnamed or the return value semantics are wrong. Oops, thanks for noticing this. Right the return value should be aligned. -- Andy Shevchenko Intel Finland Oy