From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 27 Jan 2022 15:36:56 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nD5tQ-00EwZM-QX for lore@lore.pengutronix.de; Thu, 27 Jan 2022 15:36:56 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nD5tP-0004me-A8; Thu, 27 Jan 2022 15:36:55 +0100 Received: from mail-vi1eur05on2056.outbound.protection.outlook.com ([40.107.21.56] helo=EUR05-VI1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nD5sc-0004EU-IP for ptxdist@pengutronix.de; Thu, 27 Jan 2022 15:36:10 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bjMJ7vbbwCjHqi4N/VnjfI5oZO9XNRc/TXyDJtrcTd8GSiVbN3XiqiaIVLrbnnYYTQDkQhCAwaKKKDaD0ENabOfDzK8lYwVpRp12KTY0aQZlCnU7nJAxctywDb2EPJxOPvTGSvMm0nJbaxdrjAwJ/bXEpj1pXlBl70rB1g8OIgnhsrsUVOtfdhyDLoPTQkL64Ee7d3wB9IX3NaMeWaHFVq4xrTsUqb/2uloemfdP79cwdr1/lxXxUsbktf0abpwUTyXwwsDeo2DcRzbGyCzlOuWlrZ+EI0hAuvV0pem2Nd75XeNmpgaoXILZ4YbCguQuT6V/5SALmTGOm9R7bbKyTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZT/tidOY9gH+P3Efc5zdYV02UuquRc7eITi6Vwamtqg=; b=AzQj/YRYuAgeu3z/CMvjK8OTeZv4hoG/DL/wSpleXcd+2XK+rDgHxuHQvnqbYdBIEVoMwY5c1gNPp/yoUEkkBeuWO9872udbNSvtZvTZN8QG3f+kgHpDmxyP5gSCJ8VIlpxMS77pH3bXL9Wa6DiSNaCbBSZSQuYqPqbubCIQDSFwYGEO8dfw7TLam8dRWz0mo9VdEPvY92ZdMdPiFIfoD+v/dqGpkbuEwNxylEXTUxqgrGtZ1Pvy6eQBm2xVtjhMhMJ9hUk7KMT4nTym6fwK5k7ma8zLdW80PThXrMYYqrvmAxmIA+I4GK/IvlbV0lfrw7kINVXIwcZ2BDvDrQaZdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZT/tidOY9gH+P3Efc5zdYV02UuquRc7eITi6Vwamtqg=; b=ezc+zvMv5aNPGowPn7+mm+2B0ouztZS1wBSz1qrq5TgXQPfr/a+TDOysQjOfjjJf9m6tdg2ghHaeZPrfW2uG9vniD3lD7jQSg9cS6xjPv/AAyv6HluOKarqYAUs3kX/4CIxr+gtzHgP1h6omfBoPl2mlO0hjgJ5+/z/wz0weNZg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by DU0P251MB0598.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:329::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Thu, 27 Jan 2022 14:36:00 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe%4]) with mapi id 15.20.4930.015; Thu, 27 Jan 2022 14:35:59 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Thu, 27 Jan 2022 15:35:21 +0100 Message-Id: <20220127143532.2212796-2-christian.melki@t2data.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220127143532.2212796-1-christian.melki@t2data.com> References: <20220127143532.2212796-1-christian.melki@t2data.com> X-ClientProxiedBy: HE1PR1001CA0014.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:3:f7::24) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1fd90363-6f51-49a7-4171-08d9e1a2563b X-MS-TrafficTypeDiagnostic: DU0P251MB0598:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f9w9o7WRp9f3FtmYPY4lUMellYzwLTxh8U21wXXUdF2SOyiwCPS8a0UGdN0U3m31thYiXrAanY18PZSlhQJQ2h9Rc92Iw0E1qsdwURQAhG0w1AOeN9l6IzbWjalNgLXGD5chXTMaD7OrWO2WpE8pmk7jiC2nu4nGcCJtDfQ4+UrTeLgNzjPwU1TfME2D0m2MhWIA6nFJqpuLiRk1R7oBpBTzWKQaZRPAeHLqLzQsRJ4K2Yd9h7TwzGuK2l23J67A7Nn0X6L4oYDVEmGU7M57nFTFlvdntWoeOh1m04MQnaRohJKuXHpDagWWDHG7BFAUt+g4NhZqAskxY9s5gtToBCsu3u7+UAaiPXbKf+3llLb+jAA1cI9QL5ZRnhFbGdSRR6pnozcrCqlV/hxd6k0JKl9G0er6uf6KI7L32byZo+11yeOzFbL+ArSVyGIdBtfEb8AawuKyCNZAN0X9awzJCxsB8reCX4K0VrLP4rwV3dtjbpshLztfdG7e6pJuJqLj2Wn7iSgoxNJ/IZWA9e81FUoKjZXvkIdd0cN5Tsl5dKI+YmTJoU9bl1jmaathmiVOvt8Bom8aAR7OPVp5plRV1Kh+vE8+BzC5Ap6mUBmRWzTFinL1tOa6L/tCkRYLTAxd3dmEzjkzNeb+74j41qd3JmtyRGkrt/Ttd8bqeE/hypKjrT+OwfZysWLyJDNNNJf7qpcEz0cnI5H6KZlfLAb/0xnZuViAB34P+2I1EShLQUXFaTRQJskoAiQSs4hGHT3tngFwHE5r7eMz/rREDOPEqDKiR55wr4LW2+ZkWtGKwao= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(366004)(136003)(346002)(396003)(39830400003)(376002)(966005)(6512007)(44832011)(36756003)(6486002)(5660300002)(2906002)(508600001)(66476007)(66946007)(38100700002)(52116002)(86362001)(6916009)(83380400001)(316002)(66556008)(6666004)(8936002)(8676002)(186003)(38350700002)(2616005)(6506007)(1076003)(26005)(20210929001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YjUlF3xDQxmZWqKshQzbjtV9jB93Z5NjjdcH6z1GGTwRThqKFp3fIyIeM081?= =?us-ascii?Q?qfOu31BYvm1o5PsKkoNTFw7rRi0KSwhyWWRdijlYj+NY4BXLfauSf3c+5NwQ?= =?us-ascii?Q?tevNzyxNHuBCUdtHY28fENd/oEgVUDsmgrKawoUslE8lcx2FJsM4BywfrKHX?= =?us-ascii?Q?9shnWuKiZHE7AXN2fg9KDN8PdApL70QtqAfN33AZY08uDqoq2D53JvI0fXT5?= =?us-ascii?Q?3OopxWJ8jvnlvqO3hQACT01QsZVEwVN0QHSR64D1/mubVNDeNomq2RX4EILK?= =?us-ascii?Q?5FeVyHJHPeh69gixT4leQHqnMyIgJYEkKaYlh82r7sa+7gA9PYJEts1uNSNb?= =?us-ascii?Q?ojmgsJaCGB0OK6vlsif5ikOA2XKzGgFDeZ6dVIrWI5Gf7fGwliczefQZML8N?= =?us-ascii?Q?DJOcI2CQdaoEXqm4K8DPTmE5NwRLFLtmuH5WH3yur56FkfadM98YIoLPMyL9?= =?us-ascii?Q?LzXey7kG35dHFKHGGstwG+4F9xqd2k1z8SyCyP8FEptOxATBMEhMl/kM82TP?= =?us-ascii?Q?81hmh7+qXmVOPN6B5aL3o/1x+FTXTC49nvUD+uh0O9tD14/nKdsRCyDQZd30?= =?us-ascii?Q?CMuwkRyMkFVQ5/nL1zxXObRUn4T6tVv75DAJ8G11nWYszwiH2x25DB/GBqo0?= =?us-ascii?Q?EFvUKAbw6lT25FJIIgPPdz1PoKW1TUhgLgDxOKxDAvjYbYnf056tyvMTTZW4?= =?us-ascii?Q?PQSdSJnvrLKReMF9CytAwADF3yYlPwzexsOMNqISmbVd8l/VYwjpdJS0nwHe?= =?us-ascii?Q?HQVdBhFyNrcd/6BowG8/JBWqrmRhOy8YuJmglAMxmSopBri78uCtndn4zaLP?= =?us-ascii?Q?fpjJ/GDrevsuPIDGkf94g4zPDy7ZdpS8FXWXk6iN2LWIl8ik8Y+d2G7uIMDq?= =?us-ascii?Q?bF7VQvrZBkpzgDZsTtvujDLRcaJfLdSJRgaSHk2oElPvydFowdkAI5bWmOXe?= =?us-ascii?Q?gtiVCWuZiCDeVOzVO2fWrHIC5maz6icjynx/6ttv+FplCyfLJwN7Uwa4soJ2?= =?us-ascii?Q?FxiVKWvcdapc479EjldNhC79q6RPX+YL+zI0BWIshwjH7uUzud1ryGjYJZED?= =?us-ascii?Q?OFJHPeDIVECTUKFhUNO0VWhAk7aVQtamgurUNp9TAiVqtKk0V8PIHl8lap1u?= =?us-ascii?Q?/OJj1XRjTP5ZUVGeY3YtA9Z6VweieBmIF1W4earq664mQoX+paIXd6NeHWbX?= =?us-ascii?Q?T696ujQpDpT0Py399AHQ84zq91yh9GoxnpUt3c1auDDrBetU4QKGs0aqY7j3?= =?us-ascii?Q?u46q+oqHhV8yTua5QJvMf0t3KssF5LjrvFaTOV1mqpzsB0cCvSGT5E5klzb4?= =?us-ascii?Q?i8HoHA7YLs5E6+QBsIBtMQPFOiv8yS1qQYwwO6y7GsZ/G9PT/pKK0APqqJp6?= =?us-ascii?Q?XHWOyPGcUY6e6tGtBLW0uKETsZTZHadfwO/fZoueezR+w4UIMqZH7mLmiHlw?= =?us-ascii?Q?R6q5vq+9891hffU9xvwDZcWqL8OjN7JcdLStc2vwwR6AJbpOYDLKJMShy+zW?= =?us-ascii?Q?eTqQpAM2uoPQemORPtwKMLfV1tlc9vGQWBXqjbOoynea65takpsxeCPQcRCx?= =?us-ascii?Q?YsynwGTNxZ6u06fKmcRhMGhZdclnZXpJNUJijBNSkA7MMG66Znig+kE+ifEQ?= =?us-ascii?Q?4NyqCztlswZwX7kgurAXR2rPrJ2Q5C8v1yaGMfWTKY1DIaMQssS432jVKUHx?= =?us-ascii?Q?Wh0/mgJSaOYtdp+eX//LrLZcGYY=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1fd90363-6f51-49a7-4171-08d9e1a2563b X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 14:35:59.8874 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Asbtj5vOwE50BIiwWNMktyushcl/Ebpj0O6SW6gf4/MIraHy2zp5JJUWoJz4VWbS7AQbGsQj8BovurMXvF8+l601Y1jZ08F7ZQ1qjZqemr4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P251MB0598 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] efivar: Version bump 37 -> 38. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Contains approx 2 years worth of fixes, including a lot of compile error fixes. So drop old patchset. Signed-off-by: Christian Melki --- ..._guid-handle-misaligned-guid-pointer.patch | 55 ------ ...es-Werror-address-of-packed-member-c.patch | 167 ------------------ patches/efivar-37/series | 5 - rules/efivar.make | 4 +- 4 files changed, 2 insertions(+), 229 deletions(-) delete mode 100644 patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch delete mode 100644 patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch delete mode 100644 patches/efivar-37/series diff --git a/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch b/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch deleted file mode 100644 index 89e913a74..000000000 --- a/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Peter Jones -Date: Mon, 7 Jan 2019 10:30:59 -0500 -Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers - safely. - -GCC 9 adds -Werror=address-of-packed-member, which causes us to see the -build error reported at - https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 . - -That bug report shows us the following: - -In file included from dp.c:26: -dp.h: In function 'format_vendor_helper': -dp.h:120:37: error: taking address of packed member of 'struct ' may result in an unaligned pointer value [-Werror=address-of-packed-member] - 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~ -dp.h:74:25: note: in definition of macro 'format_guid' - 74 | _rc = efi_guid_to_str(guid, &_guidstr); \ - | ^~~~ -cc1: all warnings being treated as errors - -This patch makes format_guid() use a local variable as a bounce buffer -in the case that the guid we're passed is aligned as chaotic neutral. - -Note that this only fixes this instance and there may be others that bz -didn't show because it exited too soon, and I don't have a gcc 9 build -in front of me right now. - -Signed-off-by: Peter Jones ---- - src/dp.h | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/dp.h b/src/dp.h -index aa4e3902992d..20cb608d05f7 100644 ---- a/src/dp.h -+++ b/src/dp.h -@@ -70,8 +70,15 @@ - #define format_guid(buf, size, off, dp_type, guid) ({ \ - int _rc; \ - char *_guidstr = NULL; \ -- \ -- _rc = efi_guid_to_str(guid, &_guidstr); \ -+ efi_guid_t _guid; \ -+ const efi_guid_t * const _guid_p = \ -+ likely(__alignof__(guid) == sizeof(guid)) \ -+ ? guid \ -+ : &_guid; \ -+ \ -+ if (unlikely(__alignof__(guid) == sizeof(guid))) \ -+ memmove(&_guid, guid, sizeof(_guid)); \ -+ _rc = efi_guid_to_str(_guid_p, &_guidstr); \ - if (_rc < 0) { \ - efi_error("could not build %s GUID DP string", \ - dp_type); \ diff --git a/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch b/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch deleted file mode 100644 index 7653bd80a..000000000 --- a/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch +++ /dev/null @@ -1,167 +0,0 @@ -From: Peter Jones -Date: Thu, 21 Feb 2019 15:20:12 -0500 -Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches. - -This gets rid of all the places GCC 9's -Werror=address-of-packed-member -flags as problematic. - -Fixes github issue #123 - -Signed-off-by: Peter Jones ---- - src/dp-message.c | 6 ++++-- - src/dp.h | 12 ++++-------- - src/guid.c | 2 +- - src/include/efivar/efivar.h | 2 +- - src/ucs2.h | 27 +++++++++++++++++++-------- - 5 files changed, 29 insertions(+), 20 deletions(-) - -diff --git a/src/dp-message.c b/src/dp-message.c -index 3724e5f57bdb..9f964663de86 100644 ---- a/src/dp-message.c -+++ b/src/dp-message.c -@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) - ) / sizeof(efi_ip_addr_t); - format(buf, size, off, "Dns", "Dns("); - for (int i=0; i < end; i++) { -- const efi_ip_addr_t *addr = &dp->dns.addrs[i]; -+ efi_ip_addr_t addr; -+ -+ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr)); - if (i != 0) - format(buf, size, off, "Dns", ","); - format_ip_addr(buf, size, off, "Dns", -- dp->dns.is_ipv6, addr); -+ dp->dns.is_ipv6, &addr); - } - format(buf, size, off, "Dns", ")"); - break; -diff --git a/src/dp.h b/src/dp.h -index 20cb608d05f7..1f921d524aaf 100644 ---- a/src/dp.h -+++ b/src/dp.h -@@ -71,13 +71,9 @@ - int _rc; \ - char *_guidstr = NULL; \ - efi_guid_t _guid; \ -- const efi_guid_t * const _guid_p = \ -- likely(__alignof__(guid) == sizeof(guid)) \ -- ? guid \ -- : &_guid; \ -- \ -- if (unlikely(__alignof__(guid) == sizeof(guid))) \ -- memmove(&_guid, guid, sizeof(_guid)); \ -+ const efi_guid_t * const _guid_p = &_guid; \ -+ \ -+ memmove(&_guid, guid, sizeof(_guid)); \ - _rc = efi_guid_to_str(_guid_p, &_guidstr); \ - if (_rc < 0) { \ - efi_error("could not build %s GUID DP string", \ -@@ -86,7 +82,7 @@ - _guidstr = onstack(_guidstr, \ - strlen(_guidstr)+1); \ - _rc = format(buf, size, off, dp_type, "%s", \ -- _guidstr); \ -+ _guidstr); \ - } \ - _rc; \ - }) -diff --git a/src/guid.c b/src/guid.c -index 306c9ff8287c..3156b3b7c60a 100644 ---- a/src/guid.c -+++ b/src/guid.c -@@ -31,7 +31,7 @@ - extern const efi_guid_t efi_guid_zero; - - int NONNULL(1, 2) PUBLIC --efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b) -+efi_guid_cmp(const void * const a, const void * const b) - { - return memcmp(a, b, sizeof (efi_guid_t)); - } -diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h -index 316891ccae9c..ad6449d9d938 100644 ---- a/src/include/efivar/efivar.h -+++ b/src/include/efivar/efivar.h -@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid) - - extern int efi_guid_is_zero(const efi_guid_t *guid); - extern int efi_guid_is_empty(const efi_guid_t *guid); --extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b); -+extern int efi_guid_cmp(const void * const a, const void * const b); - - /* import / export functions */ - typedef struct efi_variable efi_variable_t; -diff --git a/src/ucs2.h b/src/ucs2.h -index dbb59004b7c0..edd8367b4bcc 100644 ---- a/src/ucs2.h -+++ b/src/ucs2.h -@@ -23,16 +23,21 @@ - (((val) & ((mask) << (shift))) >> (shift)) - - static inline size_t UNUSED --ucs2len(const uint16_t * const s, ssize_t limit) -+ucs2len(const void *vs, ssize_t limit) - { - ssize_t i; -- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++) -+ const uint16_t *s = vs; -+ const uint8_t *s8 = vs; -+ -+ for (i = 0; -+ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; -+ i++, s8 += 2, s++) - ; - return i; - } - - static inline size_t UNUSED --ucs2size(const uint16_t * const s, ssize_t limit) -+ucs2size(const void *s, ssize_t limit) - { - size_t rc = ucs2len(s, limit); - rc *= sizeof (uint16_t); -@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit) - } - - static inline unsigned char * UNUSED --ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) -+ucs2_to_utf8(const void * const voidchars, ssize_t limit) - { - ssize_t i, j; - unsigned char *ret; -+ const uint16_t * const chars = voidchars; - - if (limit < 0) - limit = ucs2len(chars, -1); -@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) - } - - static inline ssize_t UNUSED NONNULL(4) --utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) -+utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8) - { - ssize_t req; - ssize_t i, j; -+ uint16_t *ucs2 = ucs2void; -+ uint16_t val16; - - if (!ucs2 && size > 0) { - errno = EINVAL; -@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) - val = utf8[i] & 0x7f; - i += 1; - } -- ucs2[j] = val; -+ val16 = val; -+ ucs2[j] = val16; -+ } -+ if (terminate) { -+ val16 = 0; -+ ucs2[j++] = val16; - } -- if (terminate) -- ucs2[j++] = (uint16_t)0; - return j; - }; - diff --git a/patches/efivar-37/series b/patches/efivar-37/series deleted file mode 100644 index e6f14fec2..000000000 --- a/patches/efivar-37/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch -0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch -# cbb8f240dc2a442323107d34454fa178 - git-ptx-patches magic diff --git a/rules/efivar.make b/rules/efivar.make index db0ed001f..3d088b01c 100644 --- a/rules/efivar.make +++ b/rules/efivar.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_EFIVAR) += efivar # # Paths and names # -EFIVAR_VERSION := 37 -EFIVAR_MD5 := 9f067275c5f7aafdd75bfb364280ac9c +EFIVAR_VERSION := 38 +EFIVAR_MD5 := 243fdbc48440212695cb9c6e6fd0f44f EFIVAR := efivar-$(EFIVAR_VERSION) EFIVAR_SUFFIX := tar.bz2 EFIVAR_URL := https://github.com/rhboot/efivar/releases/download/$(EFIVAR_VERSION)/$(EFIVAR).$(EFIVAR_SUFFIX) -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de