Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/956562/?format=api
{ "id": 956562, "url": "http://patchwork.ozlabs.org/api/patches/956562/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20180811152820.26817-8-xypron.glpk@gmx.de/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20180811152820.26817-8-xypron.glpk@gmx.de>", "list_archive_url": null, "date": "2018-08-11T15:28:12", "name": "[U-Boot,07/15] efi_loader: remove limit on variable length", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "27dea51f6cc441865c197604ca9688d07517a290", "submitter": { "id": 61270, "url": "http://patchwork.ozlabs.org/api/people/61270/?format=api", "name": "Heinrich Schuchardt", "email": "xypron.glpk@gmx.de" }, "delegate": { "id": 3400, "url": "http://patchwork.ozlabs.org/api/users/3400/?format=api", "username": "agraf", "first_name": "Alexander", "last_name": "Graf", "email": "agraf@suse.de" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20180811152820.26817-8-xypron.glpk@gmx.de/mbox/", "series": [ { "id": 60397, "url": "http://patchwork.ozlabs.org/api/series/60397/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=60397", "date": "2018-08-11T15:28:06", "name": "efi_loader: EFI_UNICODE_COLLATION_PROTOCOL", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/60397/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/956562/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/956562/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=gmx.de" ], "Received": [ "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 41nmDf48KRz9sBD\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSun, 12 Aug 2018 01:31:30 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid 40EAFC21C8B; Sat, 11 Aug 2018 15:30:52 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 21661C21D4A;\n\tSat, 11 Aug 2018 15:28:51 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid CE3E1C21D65; Sat, 11 Aug 2018 15:28:45 +0000 (UTC)", "from mout.gmx.net (mout.gmx.net [212.227.17.22])\n\tby lists.denx.de (Postfix) with ESMTPS id 6F9BCC21CB1\n\tfor <u-boot@lists.denx.de>; Sat, 11 Aug 2018 15:28:45 +0000 (UTC)", "from LT02.fritz.box ([88.152.14.153]) by mail.gmx.com (mrgmx102\n\t[212.227.17.174]) with ESMTPSA (Nemesis) id 0LyB6P-1g0bDa3XEb-015WCQ;\n\tSat, 11 Aug 2018 17:28:43 +0200" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.0 required=5.0 tests=FREEMAIL_FROM\n\tautolearn=unavailable autolearn_force=no version=3.4.0", "From": "Heinrich Schuchardt <xypron.glpk@gmx.de>", "To": "Alexander Graf <agraf@suse.de>", "Date": "Sat, 11 Aug 2018 17:28:12 +0200", "Message-Id": "<20180811152820.26817-8-xypron.glpk@gmx.de>", "X-Mailer": "git-send-email 2.18.0", "In-Reply-To": "<20180811152820.26817-1-xypron.glpk@gmx.de>", "References": "<20180811152820.26817-1-xypron.glpk@gmx.de>", "X-Provags-ID": "V03:K1:bwf7uzVsZoafcPHtptpXXMOtYLQiWjWnXuXev3SSQpgmOG/GoKR\n\tN5i9ndVENtDVJDTf9jibuwKSy/kybWAru96y6wSiy5fgNEZmPoGCkhNvOhq/kMEG8bq2fpa\n\ti3EoAkJZbEzFloB9rqtthT9YtW147YBrR7HE4oh+TqZ5lxe+5mrtFPY9XJhsbRm0+c7Vu8M\n\tCuvD5xqspZrKIjjYiGDuQ==", "X-UI-Out-Filterresults": "notjunk:1; V01:K0:rCOQ6NnX7rM=:xTbJ09bkQM0QA9mevGOG54\n\tV7Vfb0CmK3Zbc8PtMCaE41YfOGNR8kWFl0VrHxA+no7X4Gg1zumeZkuV4eHqtlBYFqETvNbjj\n\tj60/url8OZK4r9mqR+xhIA6RZbevssHqSVH8nLfv7mpbEd2cVWweZYUH44qFOWg1EHK+XAHYA\n\t4zQQ/69e1W2g1Qk3dWn34l2J7B8gd3ADGN4AzT7CfzxRe2s16VcHQj4fQMRxY1sTU2ctv7HYE\n\t8skOzUrYLRvSdIR9XUqGVikSbdoPB/Tbg53swvm5bt89YngEQPM6R+9R5Im2EYBoDtW2Qw/cc\n\tMkayocBOvX5wtG79PWTThFK8cGPk6zr1PaxbFUWnhHUWGspW7dzEtFwdJqCU51S8vkl0en+GR\n\tjS5CTX11W3kZkSrMOMQlvDcJs3XDewiCBvoFQUCT9luyTLV4BwnqRRfcO+nuAyvnZhYzD2XmC\n\tffiBxhfi5X+vKy/iPFuW8owgNSNHm7jAb2e7VHEU7Svhe0VKHcK3fO4e4Z8SMyFuSH+CZCloH\n\telEebW/1xFNs3TI9MQWFKDrvwk3cnOjYjKWGO2DToVgqbnleydz3voUL9hsOTXhwZwkG2PUsy\n\t43QyFth45Gph0pSvB5ecnd23mk9n4yCwza8SQz7FIiO+0nZ7MXYRm6lEjVf3GUmx8WXpX1E2E\n\tsNGGuPdZr14C6tWNvazmQr43UCe5siOrwi5wCZjCqn1GnY67jicAALZ01lK8gHVIbA36f+Ya8\n\tZHZEgfEZdoaqpnbLl0qqG6p7YDEnwbKEalY2nMgSeXmE9/Y47eWKEn7LePM=", "Cc": "Heinrich Schuchardt <xypron.glpk@gmx.de>, u-boot@lists.denx.de", "Subject": "[U-Boot] [PATCH 07/15] efi_loader: remove limit on variable length", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.18", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>" }, "content": "The EFI spec does not provide a length limit for variables.\n\nSigned-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>\n---\n lib/efi_loader/efi_variable.c | 52 ++++++++++++++++++++---------------\n 1 file changed, 30 insertions(+), 22 deletions(-)", "diff": "diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c\nindex 770c67abb9..495738884b 100644\n--- a/lib/efi_loader/efi_variable.c\n+++ b/lib/efi_loader/efi_variable.c\n@@ -44,10 +44,7 @@\n * converted to utf16?\n */\n \n-#define MAX_VAR_NAME 31\n-#define MAX_NATIVE_VAR_NAME \\\n-\t(strlen(\"efi_xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxxxxxx_\") + \\\n-\t\t(MAX_VAR_NAME * MAX_UTF8_PER_UTF16))\n+#define PREFIX_LEN (strlen(\"efi_xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxxxxxx_\"))\n \n static int hex(int ch)\n {\n@@ -101,18 +98,20 @@ static char *mem2hex(char *hexstr, const u8 *mem, int count)\n \treturn hexstr;\n }\n \n-static efi_status_t efi_to_native(char *native, u16 *variable_name,\n+static efi_status_t efi_to_native(char **native, const u16 *variable_name,\n \t\t\t\t efi_guid_t *vendor)\n {\n \tsize_t len;\n+\tchar *pos;\n \n-\tlen = u16_strlen((u16 *)variable_name);\n-\tif (len >= MAX_VAR_NAME)\n-\t\treturn EFI_DEVICE_ERROR;\n+\tlen = PREFIX_LEN + utf16_utf8_strlen(variable_name) + 1;\n+\t*native = malloc(len);\n+\tif (!*native)\n+\t\treturn EFI_OUT_OF_RESOURCES;\n \n-\tnative += sprintf(native, \"efi_%pUl_\", vendor);\n-\tnative = (char *)utf16_to_utf8((u8 *)native, (u16 *)variable_name, len);\n-\t*native = '\\0';\n+\tpos = *native;\n+\tpos += sprintf(pos, \"efi_%pUl_\", vendor);\n+\tutf16_utf8_strcpy(&pos, variable_name);\n \n \treturn EFI_SUCCESS;\n }\n@@ -168,7 +167,7 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_guid_t *vendor,\n \t\t\t\t u32 *attributes, efi_uintn_t *data_size,\n \t\t\t\t void *data)\n {\n-\tchar native_name[MAX_NATIVE_VAR_NAME + 1];\n+\tchar *native_name;\n \tefi_status_t ret;\n \tunsigned long in_size;\n \tconst char *val, *s;\n@@ -180,13 +179,14 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_guid_t *vendor,\n \tif (!variable_name || !vendor || !data_size)\n \t\treturn EFI_EXIT(EFI_INVALID_PARAMETER);\n \n-\tret = efi_to_native(native_name, variable_name, vendor);\n+\tret = efi_to_native(&native_name, variable_name, vendor);\n \tif (ret)\n \t\treturn EFI_EXIT(ret);\n \n \tdebug(\"%s: get '%s'\\n\", __func__, native_name);\n \n \tval = env_get(native_name);\n+\tfree(native_name);\n \tif (!val)\n \t\treturn EFI_EXIT(EFI_NOT_FOUND);\n \n@@ -256,35 +256,41 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor,\n \t\t\t\t u32 attributes, efi_uintn_t data_size,\n \t\t\t\t void *data)\n {\n-\tchar native_name[MAX_NATIVE_VAR_NAME + 1];\n+\tchar *native_name = NULL, *val = NULL, *s;\n \tefi_status_t ret = EFI_SUCCESS;\n-\tchar *val, *s;\n \tu32 attr;\n \n \tEFI_ENTRY(\"\\\"%ls\\\" %pUl %x %zu %p\", variable_name, vendor, attributes,\n \t\t data_size, data);\n \n-\tif (!variable_name || !vendor)\n-\t\treturn EFI_EXIT(EFI_INVALID_PARAMETER);\n+\tif (!variable_name || !vendor) {\n+\t\tret = EFI_INVALID_PARAMETER;\n+\t\tgoto out;\n+\t}\n \n-\tret = efi_to_native(native_name, variable_name, vendor);\n+\tret = efi_to_native(&native_name, variable_name, vendor);\n \tif (ret)\n-\t\treturn EFI_EXIT(ret);\n+\t\tgoto out;\n \n #define ACCESS_ATTR (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)\n \n \tif ((data_size == 0) || !(attributes & ACCESS_ATTR)) {\n \t\t/* delete the variable: */\n \t\tenv_set(native_name, NULL);\n-\t\treturn EFI_EXIT(EFI_SUCCESS);\n+\t\tret = EFI_SUCCESS;\n+\t\tgoto out;\n \t}\n \n \tval = env_get(native_name);\n \tif (val) {\n \t\tparse_attr(val, &attr);\n \n-\t\tif (attr & READ_ONLY)\n-\t\t\treturn EFI_EXIT(EFI_WRITE_PROTECTED);\n+\t\tif (attr & READ_ONLY) {\n+\t\t\t/* We should not free val */\n+\t\t\tval = NULL;\n+\t\t\tret = EFI_WRITE_PROTECTED;\n+\t\t\tgoto out;\n+\t\t}\n \t}\n \n \tval = malloc(2 * data_size + strlen(\"{ro,run,boot}(blob)\") + 1);\n@@ -320,6 +326,8 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor,\n \tif (env_set(native_name, val))\n \t\tret = EFI_DEVICE_ERROR;\n \n+out:\n+\tfree(native_name);\n \tfree(val);\n \n \treturn EFI_EXIT(ret);\n", "prefixes": [ "U-Boot", "07/15" ] }