From nobody Thu May 2 04:57:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 152271180366773.13826692238331; Mon, 2 Apr 2018 16:30:03 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 41161224DD14A; Mon, 2 Apr 2018 16:30:02 -0700 (PDT) Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0CDE62202E4A5 for ; Mon, 2 Apr 2018 16:30:00 -0700 (PDT) Received: by mail-wm0-x242.google.com with SMTP id g8so5262887wmd.2 for ; Mon, 02 Apr 2018 16:30:00 -0700 (PDT) Received: from [192.168.1.10] (catv-89-134-174-61.catv.broadband.hu. [89.134.174.61]) by smtp.gmail.com with ESMTPSA id b34sm3234713wra.21.2018.04.02.16.29.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 16:29:57 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=kornelpal@gmail.com; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=Bo2DeuL2h9rgmU4zvn9qHmC9KxS3wYiH7raguLt7BL4=; b=B/9CNXnmJx8edPHP7Evjth1ZNew0nv4LMwGSngh3iYVsDu+KU/iNO3E2fKCuL76OBi W7eWuWzKZpErUf1IMadskl3aJYo6PVAZ+ytY159sQ70lYtvinfoZ20gYDiVkpG9gllQ2 IOOlxmhJ8vnBTLFWSVV8mQQtptBTGzJ+AAV3G3tazI8oeEKU14bIMBzimKi96ra6kOsv AHJB1REQa8dHYFlZBtkQLHuUjOg4lZpAzHzAPBU7fGTtPJn01rTmh0thZ6D599TybuXh dyZtnlwctCezyvn3RdIJS5vj+MtA+3/Z3NSTjyB96ZhjOXQhOrl60YwQKmxN8glXpvlO p0Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=Bo2DeuL2h9rgmU4zvn9qHmC9KxS3wYiH7raguLt7BL4=; b=DQu0jQF6IB1BwWGSAGgYMg3oJOKkSHmigLCYQ/rj7ECK8/Oo/vQJ3cX6i2cPE0uFzT X0dymtGE0uibCmtYHi/uBqt3qAtb3975fqhNAl03QcYuJ//ps0jWii7Q3jNnpvRGwKJy LhJbQAs71CIMbrK5T9l+3UQIwxzcaaaZh1+9rZWdknNoBNFnB7Hs5yh8fHCS5iRbICOZ X4XsDA3y76/ZkF6vUlAz+0xKC9ZlqgtUH6X6mSWyNScHLp5cWWzG4cdra26pVm2t30Hv sCmcUNYL9z01h9hfjgcsLuroia0/F3Bjt2OviHvYBny8b1uHrbAT+xeWvGm5qGneWWSp kkKQ== X-Gm-Message-State: AElRT7EvFfnvyyrOyTAwJZou8B4slY4mS9rcEIoFGBhfaTBw70g7nlic tBYtfhjaQPCWA69g0iRBYNQ= X-Google-Smtp-Source: AIpwx489mS0mi/GYBQGSeGNupDB1s3wpineENaxEIdZ+rFl1w+YmoN+0LoPQjR+x4CSyBqmsKR7INw== X-Received: by 10.28.144.134 with SMTP id s128mr2181125wmd.26.1522711798565; Mon, 02 Apr 2018 16:29:58 -0700 (PDT) To: edk2-devel@lists.01.org From: Kornel Pal Message-ID: <0db03fa9-a9b4-7582-e93d-b7203361b935@gmail.com> Date: Tue, 3 Apr 2018 01:29:57 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: en-US Subject: [edk2] [Patch] ShellPkg/dblk: Avoid overwriting Media->IoAlign X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jaben Carsey , Ruiyu Ni Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8"; format="flowed" According to the UEFI Specification, data values in EFI_BLOCK_IO_MEDIA=20 are read-only. This patch introduces a local variable to avoid overwriting IoAlign and=20 reduces unnecessary overallocation. Cc: Jaben Carsey Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Kornel Pal --- =C2=A0ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c | 10 ++++++---- =C2=A01 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c=20 b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c index 3632ca8a7a..b2cbae84f3 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c @@ -39,6 +39,7 @@ DisplayTheBlocks( =C2=A0=C2=A0 UINT8=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *Buffer; =C2=A0=C2=A0 UINT8=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *Origina= lBuffer; =C2=A0=C2=A0 UINTN=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 BufferSi= ze; +=C2=A0 UINT32=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 IoAlign; =C2=A0=C2=A0 ShellStatus =3D SHELL_SUCCESS; @@ -53,13 +54,14 @@ DisplayTheBlocks( =C2=A0=C2=A0 } =C2=A0=C2=A0 BufferSize =3D BlockIo->Media->BlockSize * BlockCount; -=C2=A0 if(BlockIo->Media->IoAlign =3D=3D 0) { -=C2=A0=C2=A0=C2=A0 BlockIo->Media->IoAlign =3D 1; +=C2=A0 IoAlign=C2=A0=C2=A0=C2=A0 =3D BlockIo->Media->IoAlign; +=C2=A0 if (IoAlign =3D=3D 0) { +=C2=A0=C2=A0=C2=A0 IoAlign =3D 1; =C2=A0=C2=A0 } =C2=A0=C2=A0 if (BufferSize > 0) { -=C2=A0=C2=A0=C2=A0 OriginalBuffer =3D AllocateZeroPool(BufferSize +=20 BlockIo->Media->IoAlign); -=C2=A0=C2=A0=C2=A0 Buffer=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = =3D ALIGN_POINTER=20 (OriginalBuffer,BlockIo->Media->IoAlign); +=C2=A0=C2=A0=C2=A0 OriginalBuffer =3D AllocateZeroPool(BufferSize + IoAlig= n - 1); +=C2=A0=C2=A0=C2=A0 Buffer=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = =3D ALIGN_POINTER (OriginalBuffer, IoAlign); =C2=A0=C2=A0 } else { =C2=A0=C2=A0=C2=A0=C2=A0 ShellPrintEx(-1,-1,L"=C2=A0 BlockSize: 0x%08x, Bl= ockCount: 0x%08x\r\n",=20 BlockIo->Media->BlockSize, BlockCount); =C2=A0=C2=A0=C2=A0=C2=A0 OriginalBuffer =3D NULL; --=20 2.15.1.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel