From patchwork Wed Sep 11 17:04:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1161165 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="SkFeBacp"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46T7YX6z8tz9sDB for ; Thu, 12 Sep 2019 03:04:48 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A7681C21D8A; Wed, 11 Sep 2019 17:04:42 +0000 (UTC) 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, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 16F82C21C93; Wed, 11 Sep 2019 17:04:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4AEC7C21D74; Wed, 11 Sep 2019 17:04:39 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lists.denx.de (Postfix) with ESMTPS id 1980FC21C93 for ; Wed, 11 Sep 2019 17:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1568221478; bh=RaQIhh9jQf3KIAvVyiAHhyetHj/S7lBET/+whLcdGdU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=SkFeBacpEzyMcSIETQdeiEjBCsJxRfOCGCgP4SmWQ30543RJtGpJtlFokw4hQ0iDK r1MOeaNpLxh8UMR1jDoKNeUN8G3h08ld06fHlKxdyD6KSOppZ50mm6Q2Xl2ClU7DBK vv2h5ocxjQDC9WYr63DPUPJUkeuBvJIA755KQJ6U= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([84.118.159.3]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MUGi9-1hi0bW44Ul-00RFcl; Wed, 11 Sep 2019 19:04:38 +0200 From: Heinrich Schuchardt To: Alexander Graf Date: Wed, 11 Sep 2019 19:04:34 +0200 Message-Id: <20190911170434.3272-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:zd4GwDTA2QWSasCx04RiapBhb2NjM17VOeiVGWEDA1zPUMl8mHo WJij00jDKT+fxSefl+I2i+dA2FHZueXSsS2Bo4o2I0umNY6Tas0d2UY57F/QCFjJ8vpiy3+ 0mtYP+nJfHh1gjOCYddVTV7pxPOBthPOHmRFCQIn8H+0eAyrFASE+lksIg5LkEO1zERStNE W40LkyNe5MyCCsc3AtOow== X-UI-Out-Filterresults: notjunk:1; V03:K0:PZ4BuCymCB0=:2yvRCWaw95Vw9pjx/SnS8L EAxyUsG9jQFRTGAClq8PppicWNFoPD+uVTX/93k//WF2R5m5Cn//alHJrnyVOMgn5SLRHD8/K +nYLJum6Gi0WQ/BeJlpaGH5OWk1RU/nVo4K128XNIT3JMxovWdwrxXO/qtqWoJ/dcUXSZxXNy c3dh/PA609EIjjVWHt1OUcacqjXGaY8G5RWahb5PH9xtD4FAKeAs4vNq8W+uOQCByEkdd3rLV YoPETvFq2s0hqs6Idjl/lBTo2wwIMr9CjJbrUXGUTrYXbMSOSIcxj6Ef5KxuzLIV6wyWb4wKz 7JvtvDN0HZiAKrCRGKFeMRezOxhd/dIimVlJ5pLb6uFItr+HNWfAlm5444D+enOO6ls2t+kx0 cEd2xdy5eNYVYXypx+LPaP0rs0T/Itpa4EC9mEkYVG1JmZ13CZI7BYjIQ8wFMwo2aO6usnEfJ dk/e9NzhFxBAws85E7cMQeDaZZvLd3mIh9QqatC7qIc6pRuFfwO8Ronq7+iVgnxeXpnFp67kT hCQKs17NhwGPxdBHvY2NekcTv5sYvxMJKlrOxeiSNgZExat70ByowsPRvdA2lGgWa342Kr73o S+OcHoCVgfKgklCRVkOpqMFQKD2JtjCS3OU0Krju4dd010/mSVWE2PCs9OvKew1v1IkOTuM3I aZp+SoNs8h+AEA8WqRNPC9ERE/3OT4nM0jYTm/+vbA97stPXhJT2NrpseCp6BNxyH+21D9Bfy eHNihoMIXAC2ooBYil5l+4g5pxIfWp9yQQAl1Cvi8SZ2yG4zmkoNbyn0WaZmZZ/FlJE2FUFt0 Q0aP5sKuBr4plaL5eb54jUomLqFr7qxm5eN3O9Cjsl6hzSpo9VgsfyX1NarOJ438p9JW//Aky mmU76tJHCZqBfS8DeGBQmupFywuuOzipz5fF6Wek/zCtVvNJfixf9RN3+NY7tLElKndob9abN GpTFC2mh1i5a6dkVGkLL/OwkegNWqbVvl4nf6ZL3GYC3veYqNO3UUK/XcNxxxvTfPBhzSl6bo CMaLbhQSS/D2FocQwMLpfu5l19PiWlWYCG3AUBjAJxPc3gz9YzpgT2FwN2ToTLW9caJGppzuB JlrcKU/wTfdIbnUWmJhkV3kbSACT8785KMKx2NUvYcvUKMe1qGrEOYPntD2JqTBdSa+NmlADx XYN63ZmZskdSr9ysOa7aUg3Bj4BIaBJMMF+hpBQp457DfVPzeXDykBklM33tGCooR6tRQ= Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [U-Boot] [PATCH 1/1] efi_loader parameter checks EFI_FILE_PROTOCOL.SetInfo() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" We do not support volume label changes. No parameter checks are needed here. When the info for as file is changed the buffer must always contain a file name. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_file.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.23.0 diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index b79dc5fd29..98edd9830c 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -695,7 +695,9 @@ static efi_status_t EFIAPI efi_file_setinfo(struct efi_file_handle *file, char *new_file_name, *pos; loff_t file_size; - if (buffer_size < sizeof(struct efi_file_info)) { + /* The buffer will always contain a file name. */ + if (buffer_size < sizeof(struct efi_file_info) + 2 || + buffer_size < info->size) { ret = EFI_BAD_BUFFER_SIZE; goto out; } @@ -735,12 +737,8 @@ static efi_status_t EFIAPI efi_file_setinfo(struct efi_file_handle *file, * TODO: Support read only */ ret = EFI_SUCCESS; - } else if (!guidcmp(info_type, &efi_file_system_info_guid)) { - if (buffer_size < sizeof(struct efi_file_system_info)) { - ret = EFI_BAD_BUFFER_SIZE; - goto out; - } } else { + /* TODO: We do not support changing the volume label */ ret = EFI_UNSUPPORTED; } out: