From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6654C4332F for ; Mon, 14 Nov 2022 10:12:04 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 62A3882A76; Mon, 14 Nov 2022 11:12:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 1C65D82B94; Mon, 14 Nov 2022 11:12:01 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by phobos.denx.de (Postfix) with ESMTP id 3325F82A4D for ; Mon, 14 Nov 2022 11:11:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=abdellatif.elkhlifi@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E6B5B23A; Mon, 14 Nov 2022 02:12:01 -0800 (PST) Received: from e121910.cambridge.arm.com (unknown [10.57.38.209]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9D3F93F534; Mon, 14 Nov 2022 02:11:54 -0800 (PST) Date: Mon, 14 Nov 2022 10:11:51 +0000 From: Abdellatif El Khlifi To: Anders Dellien Cc: u-boot@lists.denx.de, nd@arm.com Subject: Re: [PATCH v7 02/10] lib: uuid: introduce uuid_str_to_le_bin function Message-ID: <20221114101151.GA27264@e121910.cambridge.arm.com> References: <20221013103857.614-1-abdellatif.elkhlifi@arm.com> <20221107192055.21669-1-abdellatif.elkhlifi@arm.com> <20221107192055.21669-3-abdellatif.elkhlifi@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean On Fri, Nov 11, 2022 at 05:02:26PM +0000, Anders Dellien wrote: > Hi Abdel, > > From: U-Boot on behalf of Abdellatif El Khlifi > Date: Monday, 7 November 2022 at 19:22 > To: Abdellatif El Khlifi > Cc: Drew Reed , Achin Gupta , ilias.apalodimas@linaro.org , jens.wiklander@linaro.org , nd , sjg@chromium.org , trini@konsulko.com , u-boot@lists.denx.de , Vishnu Banavath , Xueliang Zhong > Subject: [PATCH v7 02/10] lib: uuid: introduce uuid_str_to_le_bin function > convert UUID string to little endian binary data > > Signed-off-by: Abdellatif El Khlifi > Cc: Tom Rini > Cc: Simon Glass > Cc: Ilias Apalodimas > Cc: Jens Wiklander > > --- > > Changelog: > =============== > > v7: > > * rename be_uuid_str_to_le_bin() to uuid_str_to_le_bin() > * make uuid_str_to_le_bin() implementation similar to uuid_str_to_bin() > by using same APIs > > v4: > > * rename ffa_uuid_str_to_bin to be_uuid_str_to_le_bin and put in > a standalone commit (the current) > > v3: > > * introduce ffa_uuid_str_to_bin (provided by > arm_ffa: introduce Arm FF-A low-level driver) > > include/uuid.h | 8 ++++++++ > lib/uuid.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 54 insertions(+) > > diff --git a/include/uuid.h b/include/uuid.h > index 4a4883d3b5..293a8eb0a5 100644 > --- a/include/uuid.h > +++ b/include/uuid.h > @@ -2,6 +2,8 @@ > /* > * Copyright (C) 2014 Samsung Electronics > * Przemyslaw Marczak > + * (C) Copyright 2022 ARM Limited > + * Abdellatif El Khlifi > */ > #ifndef __UUID_H__ > #define __UUID_H__ > @@ -44,4 +46,10 @@ int uuid_guid_get_bin(const char *guid_str, unsigned char *guid_bin); > const char *uuid_guid_get_str(const unsigned char *guid_bin); > void gen_rand_uuid(unsigned char *uuid_bin); > void gen_rand_uuid_str(char *uuid_str, int str_format); > + > +/** > + * uuid_str_to_le_bin - Converts a UUID string to little endian binary data > + */ > +int uuid_str_to_le_bin(const char *uuid_str, unsigned char *uuid_bin); > + > #endif > diff --git a/lib/uuid.c b/lib/uuid.c > index 465e1ac38f..cde5ae2bb7 100644 > --- a/lib/uuid.c > +++ b/lib/uuid.c > @@ -1,6 +1,8 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright 2011 Calxeda, Inc. > + * (C) Copyright 2022 ARM Limited > + * Abdellatif El Khlifi > */ > > #include > @@ -346,6 +348,50 @@ int uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin, > return 0; > } > > +/** > + * uuid_str_to_le_bin() - Convert string UUID to little endian binary data. > + * @uuid_str: pointer to UUID string > + * @uuid_bin: pointer to allocated array for little endian output [16B] > + * > + * UUID string is 36 characters (36 bytes): > + * > + * xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx > + * > + * where x is a hexadecimal character. Fields are separated by '-'s. > + * When converting to a little endian binary UUID, the string fields are reversed. > + * > + * Return: > + * > + * uuid_bin filled with little endian UUID data > + * On success 0 is returned. Otherwise, failure code. > + */ > +int uuid_str_to_le_bin(const char *uuid_str, unsigned char *uuid_bin) > +{ > + u16 tmp16; > + u32 tmp32; > + u64 tmp64; > + > + if (!uuid_str_valid(uuid_str) || !uuid_bin) > + return -EINVAL; > + > + tmp32 = cpu_to_le32(hextoul(uuid_str, NULL)); > + memcpy(uuid_bin, &tmp32, 4); > + > + tmp16 = cpu_to_le16(hextoul(uuid_str + 9, NULL)); > + memcpy(uuid_bin + 4, &tmp16, 2); > + > + tmp16 = cpu_to_le16(hextoul(uuid_str + 14, NULL)); > + memcpy(uuid_bin + 6, &tmp16, 2); > + > + tmp16 = cpu_to_le16(hextoul(uuid_str + 19, NULL)); > + memcpy(uuid_bin + 8, &tmp16, 2); > + > + tmp64 = cpu_to_le64(hextoul(uuid_str + 24, NULL)); > + memcpy(uuid_bin + 10, (char *)&tmp64, 6); > > I think we might risk overflow here on platforms where “ulong” happens to be 32 bits. Thanks Anders, a very valid point. I will use simple_strtoull() in place of hextoul() I'll make the change in v8. > > + > + return 0; > +} > + > /* > * uuid_bin_to_str() - convert big endian binary data to string UUID or GUID. > * > -- > 2.17.1