From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id F00EFAC09EA for ; Wed, 15 Nov 2023 03:13:25 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=2pE+uNBxrQkLC4pmUX35J/Be2CSEE617TVVDQSxpB2g=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:msip_labels:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type; s=20140610; t=1700018004; v=1; b=Ov7rrELQogLAdse/1ij49mNqO16CMrTvgYpUdn9+HHJqlnjb1+MQ9Jj3YpZnsIjaGnhQO0Xo 1Oc5DgjsGkkl3/gf03Zm35q2oo7BX+Jv4axFBiZyvjQLP8EdNvwtqvADp4+/94hIs9DzwOPZYnb EyYun92bPjXRSoTdZSmRPpbw= X-Received: by 127.0.0.2 with SMTP id RVSMYY7687511xLsZdY0zd2D; Tue, 14 Nov 2023 19:13:24 -0800 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.76]) by mx.groups.io with SMTP id smtpd.web10.4793.1700018003739294721 for ; Tue, 14 Nov 2023 19:13:23 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HJFjcqeGPqghx9+2R4YqAsFwCM8CYFslwF80OUF+9C7DPl0qyvC7PZ5406sd7U06RiJOvGogpfLU3CLHb7EEHGrP+WHw6WwI1GV/i1CNJewQIIf+xZZ63NYQsnls1bD52CjXJkNdmRBTYubbdKJ4Pjsr+bnfP2e0PRkYupvHO/85/Z3BPk5fyb9bq07UW0XCa1zqu4/3fsHxhzOHIQxmglmNj59PQkR8GA7Q3ptFWF7+LRCn4/beeKyO15yui5tn5+pC53RyjYaetpTzlrlPjxrdFhUhvpcXATEMO7wOmsOUnJyzAWnSkmmhFwPGg6ynT3tIWCGO7IS6NaAcBvLlhA== 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=LIor9MgBbLCoy4228+IepCo9xlh/dwtZf2bzjgz2oCI=; b=KCRfEU3ebN10/YEPH7SGFiU+9wLkCisI8SXV2xLf36+/CRVb5d3P3QFqMZEpCaQdDYkFSMR3nURKkAFOK3LhIZ+FzqdXDpMDDH3Go3rFGcwGg/Xnmv/gqMerzh16UaQGmgewC/fcRxFa0ALw+eGyRRJarxQukwHD5n6G2q95+4KEZ4raVlYVcNb/3Lo0nO907wIOwAkXhuvsWJ6Y/7+iZW5lPgEu6a1dlj6HJ8GaEV1ir97LzKvj1yDsuiQ+CgWx2+c4muBD37HOJrs3W6EHgLnztpU1biacedREsPLZrOyDkqZXnzFChoks6HiWz9uBIPOmLheB2lDepmnvX5w2Fw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none X-Received: from BY5PR12MB5544.namprd12.prod.outlook.com (2603:10b6:a03:1d9::22) by PH8PR12MB7421.namprd12.prod.outlook.com (2603:10b6:510:22b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.31; Wed, 15 Nov 2023 03:13:20 +0000 X-Received: from BY5PR12MB5544.namprd12.prod.outlook.com ([fe80::108e:2378:282b:6d89]) by BY5PR12MB5544.namprd12.prod.outlook.com ([fe80::108e:2378:282b:6d89%4]) with mapi id 15.20.7002.018; Wed, 15 Nov 2023 03:13:19 +0000 From: "Ashish Singhal via groups.io" To: "Chang, Abner" , "devel@edk2.groups.io" , "quic_llindhol@quicinc.com" , "ardb+tianocore@kernel.org" , "git@danielschaefer.me" , Jeff Brasen Subject: Re: [edk2-devel] [PATCH 1/2] EmbeddedPkg: Fix Android Boot Command Line Length Bug Thread-Topic: [PATCH 1/2] EmbeddedPkg: Fix Android Boot Command Line Length Bug Thread-Index: AQHaC28o45KxKTqhVEK1ddFT1LUAIrBtncIYgAVASACAB+5NpQ== Date: Wed, 15 Nov 2023 03:13:19 +0000 Message-ID: References: <999da9572bc2ff0bbb8d7a69740256afd6ad5cde.1698697168.git.ashishsingha@nvidia.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_ActionId=a6b136b9-740f-47e0-ac51-f7c4d0fc2256;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_ContentBits=0;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Enabled=true;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Method=Standard;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Name=General;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SetDate=2023-11-10T02:03:31Z;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BY5PR12MB5544:EE_|PH8PR12MB7421:EE_ x-ms-office365-filtering-correlation-id: cd6254e3-e2aa-49c8-b211-08dbe588d193 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: Y0I2SQXvat4jy1GfkmpxDWaK2HPj592y38mTwRsrmrTcIRa+f6jKtxBCSwnGvNbP+g5gDvrDQBDq169dRrL1YmYLC2GMy2FpZw+i9bDhd5m8rHoz0f7sp8cCOBRu3ZNmjwrs+fFZAeipZ8Tto3Y7cw/1r9sNWAVvDHNEwLPuTTI9tZ0nso76sz23mpsC25T6bNRP5awyu1txPE5jJyD/w9W68elkw+sgmRQHU1WJL82Urtk1tVdGL1fd8BidhxE2AyLUbsuFTU/0RI7kQLneOoevyoQNWpHPhaQm8oWw0peBbuDnlrC/he4lOSbEq9iC9pvUvMK81vOc6jyGS//ichwg7Jko1vbxIcuerqkoAyYMki+ZDsNdxJFjfH63pCSpP+20Ko8ygVa3qHSz3AF7p/TgS5p/aAsYsqE+lEax+5WpyxiEB2QBoxWFnkT8ubIsl/89sFxx38hvVDKvLFfBovQJGDpKEr6l5wE0zB6HBHpR98XM13B7Q2PMHegyEIpxrXrjP1UlIDsqRBBRORi7D7vrEgLOF2foNtCnasTb42FXXfh2vFmkr2ZSs4zZ7k4axE7pHm+3lYdaDgycsnFSAZsIBhzrW4QB/BbiGXEr0WUvhtNriiu/ULojurmlVenUsrCb8ukYLncW6TcA82jmZ2R9y9TkwV3dncPjyHZBwxs= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?Windows-1252?Q?wpQpjI9oR5KU5e6Ku6m2fvHUUP2kOrjaeP0sEUj8xqu/YNvpphJVEwwy?= =?Windows-1252?Q?/4Uc5JzilJKv0A1yQAtN2SrYMheN03Baq2NEbypQcUNIdzXfLir99/St?= =?Windows-1252?Q?D+vP7lZUaFJhzIJWZGSHsK6DLlHUjVvhwBge9YZZqMQvhfAtOTt6ayXw?= =?Windows-1252?Q?F1t95euIaGgflU9vrTBeOXpi2nYg31VoLYnMen2agQEcB2iBwZ6pCc0L?= =?Windows-1252?Q?HCaDDqx9vlXfy1u2IQLNymCsg2f2xoOWMFgzivga/hB0LcGHiALft9Za?= =?Windows-1252?Q?GYkbCAZsUwk2tUhWoLscwj6QqXBZredyVhOb4B3Yxhj8yi4owBq0Au1X?= =?Windows-1252?Q?EWbHSvZ+M20S9m35snc7AThpcDLNNgYX6kZfloCDX3wx3UuI4TMoKoX/?= =?Windows-1252?Q?sxeNQFuSawrZRqBhR9hrNOGIEOyF40UaiBqeW/l7Naohy3gEtyrjire1?= =?Windows-1252?Q?pd0ilq3ev6AZHDYPMxUtFdujtWQVL0+h1xGkW+//jT0nQ2L/q9sMeU1D?= =?Windows-1252?Q?fjN7ChiwlmOhxfczQD8hrkzjC8hCYP1snzycUtOz85f/GocaZDKy1cnE?= =?Windows-1252?Q?o6iY3yWH+uqPF1yYyywQSTYfa8P9ITM3KbNzKCQmzM4FBW4bD4PYdcK6?= =?Windows-1252?Q?xjBum1W7ntG6zuqqgTEXtdC3W7jxi0ZVqhpjb5ES3Vmry0490ZA2DUP/?= =?Windows-1252?Q?eBfsP2xmSSCwSN+XcTZePsPwW+534f3SV4owP4bMAXIy1/Qsiq7I8S0v?= =?Windows-1252?Q?mn/R5AESrT/z58mEHMMI04jysyt8CiSBydU+9kOAfPbuxrA9G0BDT4U6?= =?Windows-1252?Q?pjhTZEn1DwQeHk0D60/Pq4a6LccmRWcpxCilOB4DS30f02KDciKjEm5g?= =?Windows-1252?Q?MF8s/icGvIXxDlFlBIrmI92c80qiOBnHD7O/v1tkLqkaRG4juEkTHUzm?= =?Windows-1252?Q?Awz18Do3VMHQ5D1yFw+DbJqVCegI3rtzgPGgVwkRXwvoH6C73JTFergX?= =?Windows-1252?Q?M0fKwHYHgXM99JDlu253JfCv1EY/3yPSLE/FfrqvKOWCjvLSfe+KsjoI?= =?Windows-1252?Q?sXbluW+Ya3GS4hPJ+SbzWHhEOldG5Mj2vcVvMJMmfCr56yb6drZpZog/?= =?Windows-1252?Q?1ntuu8kpJXyhX2cqD4txvn2oe9mFywLX+M4OIkHyia+88CX6R2M3XMPj?= =?Windows-1252?Q?nwZLd+gjTPBfCoUgo1Xxu+EJEXKgaWslTNSZ15v6s/isvL4Eo/YSWmho?= =?Windows-1252?Q?g/OPrT5sSwB8qBNsrMEOsna3pBD4gh4l7WkW76dTv9K2X6IIMsam67Qh?= =?Windows-1252?Q?v5nnuvJk91YB4x7LiIp1k7wVS1Qhf2wkRdDW6njpDOWqy3OXsk9ZUyJT?= =?Windows-1252?Q?BqvtylFylcflnzbemq50bJCgaoWR7/JH82RiTRUA4W1wH7418aCWYZ0y?= =?Windows-1252?Q?DafK2xvFZYDjF80USvkDMNVOJtGmr+GcCC3TpRcLcV0ur3pnx8hqS2LK?= =?Windows-1252?Q?W/oEBoGyZSLCPPdhWoXZ7wv6+800zGksjIVUyxBkBeUNUy3Gql92ldC7?= =?Windows-1252?Q?F1ndXLaBupZJWQDJG0jODSfiMkfnWsrt27ViNr3fpQ6kimlXB1nXd/B/?= =?Windows-1252?Q?rUQhK67fZf2OFvUO3o3YcHq5srHTNzaiFA6eeQtqWk5EjJeyQ2S80jwM?= =?Windows-1252?Q?8R2uqJqB4BgsweB7QxqOGiSdKflR2qzE?= MIME-Version: 1.0 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB5544.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd6254e3-e2aa-49c8-b211-08dbe588d193 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2023 03:13:19.7115 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: XL93xaiHT50tdI26SZBFNwtAm+zcT9fP0baJZX3SIIJjEKZFw0ArgsTNrWnyPsfMObGqERnVoyRewmGHQGReBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7421 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashishsingha@nvidia.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: FY3Hjg601qTQnAMROXiE8Oepx7686176AA= Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_BY5PR12MB5544A102AE4728391133A5D0BAB1ABY5PR12MB5544namp_" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=Ov7rrELQ; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io --_000_BY5PR12MB5544A102AE4728391133A5D0BAB1ABY5PR12MB5544namp_ Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable Hello Abner, Thanks for the feedback. I have pushed v2 of the patch set. Thanks Ashish ________________________________ From: Chang, Abner Sent: Thursday, November 9, 2023 7:06 PM To: Ashish Singhal ; devel@edk2.groups.io ; quic_llindhol@quicinc.com ; ardb= +tianocore@kernel.org ; git@danielschaefer.me ; Jeff Brasen Subject: RE: [PATCH 1/2] EmbeddedPkg: Fix Android Boot Command Line Length = Bug External email: Use caution opening links or attachments [AMD Official Use Only - General] From: Ashish Singhal Sent: Tuesday, November 7, 2023 1:55 AM To: devel@edk2.groups.io; quic_llindhol@quicinc.com; ardb+tianocore@kernel.= org; Chang, Abner ; git@danielschaefer.me; Jeff Brasen= Subject: Re: [PATCH 1/2] EmbeddedPkg: Fix Android Boot Command Line Length = Bug Caution: This message originated from an External Source. Use proper cautio= n when opening attachments, clicking links, or responding. Hello, Hoping to get some feedback on these 2 patches this week. Thanks Ashish ________________________________ From: Ashish Singhal > Sent: Monday, October 30, 2023 2:24 PM To: devel@edk2.groups.io >; quic_llindhol@quicinc.com >; ardb+tianocore@kernel.org >; abner.chang@amd.com >= ; git@danielschaefer.me >; Jeff Brasen > Cc: Ashish Singhal = > Subject: [PATCH 1/2] EmbeddedPkg: Fix Android Boot Command Line Length Bug Curently, AndroidBootImgLib expects input kernel command line to never exceed 256 unicode characters where the image header allows for 512 ascii characters. If image header allows 512 ascii characters, similar number of unicode characters should be allowed at the minimum. Signed-off-by: Ashish Singhal > --- .../AndroidBootImgLib/AndroidBootImgLib.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/Em= beddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c index 1359a66db2..02769cd0df 100644 --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c @@ -321,8 +321,9 @@ AndroidBootImgGetFdt ( EFI_STATUS AndroidBootImgUpdateArgs ( - IN VOID *BootImg, - OUT VOID *KernelArgs + IN VOID *BootImg, + OUT VOID *KernelArgs, + IN UINT32 KernelArgsSize ) { CHAR8 ImageKernelArgs[ANDROID_BOOTIMG_KERNEL_ARGS_SIZE]; @@ -337,13 +338,13 @@ AndroidBootImgUpdateArgs ( AsciiStrToUnicodeStrS ( ImageKernelArgs, KernelArgs, - ANDROID_BOOTIMG_KERNEL_ARGS_SIZE >> 1 + KernelArgsSize ); // Append platform kernel arguments if (mAndroidBootImg->AppendArgs) { Status =3D mAndroidBootImg->AppendArgs ( KernelArgs, - ANDROID_BOOTIMG_KERNEL_ARGS_SIZE + KernelArgsSize ); } @@ -611,11 +612,16 @@ AndroidBootImgBoot ( MEMORY_DEVICE_PATH KernelDevicePath; EFI_HANDLE ImageHandle; VOID *NewKernelArg; + UINT32 NewKernelArgSize; EFI_LOADED_IMAGE_PROTOCOL *ImageInfo; VOID *RamdiskData; UINTN RamdiskSize; IN VOID *FdtBase; + if ((Buffer =3D=3D NULL) || (BufferSize =3D=3D 0)) { + return EFI_INVALID_PARAMETER; + } + NewKernelArg =3D NULL; ImageHandle =3D NULL; @@ -637,14 +643,15 @@ AndroidBootImgBoot ( goto Exit; } - NewKernelArg =3D AllocateZeroPool (ANDROID_BOOTIMG_KERNEL_ARGS_SIZE); + NewKernelArgSize =3D ANDROID_BOOTIMG_KERNEL_ARGS_SIZE; + NewKernelArg =3D AllocateZeroPool (sizeof (CHAR16) * NewKernelArgSiz= e); I think you can just move the memory allocation code to inside AndroidBootI= mgUpdateArgs then you don=92t need the additional arg for AndroidBootImgUpd= ateArgs. Also Change AndroidBootImgUpdateArgs (Buffer, NewKernelArg); to AndroidBoot= ImgUpdateArgs (Buffer, &NewKernelArg); With this the code looks simple. thanks Abner if (NewKernelArg =3D=3D NULL) { DEBUG ((DEBUG_ERROR, "Fail to allocate memory\n")); Status =3D EFI_OUT_OF_RESOURCES; goto Exit; } - Status =3D AndroidBootImgUpdateArgs (Buffer, NewKernelArg); + Status =3D AndroidBootImgUpdateArgs (Buffer, NewKernelArg, NewKernelArgS= ize); if (EFI_ERROR (Status)) { goto Exit; } -- 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111230): https://edk2.groups.io/g/devel/message/111230 Mute This Topic: https://groups.io/mt/102284239/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- --_000_BY5PR12MB5544A102AE4728391133A5D0BAB1ABY5PR12MB5544namp_ Content-Type: text/html; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable
Hello Abner,

Thanks for the feedback. I have pushed v2 of the patch set.

Thanks
Ashish
From: Chang, Abner <Abne= r.Chang@amd.com>
Sent: Thursday, November 9, 2023 7:06 PM
To: Ashish Singhal <ashishsingha@nvidia.com>; devel@edk2.group= s.io <devel@edk2.groups.io>; quic_llindhol@quicinc.com <quic_llind= hol@quicinc.com>; ardb+tianocore@kernel.org <ardb+tianocore@kernel.or= g>; git@danielschaefer.me <git@danielschaefer.me>; Jeff Brasen <jbrasen@nvidia.com>
Subject: RE: [PATCH 1/2] EmbeddedPkg: Fix Android Boot Command Line = Length Bug
 
External email: Us= e caution opening links or attachments

[AMD Official Use Only - General]


 

 

From: Ashish Singhal <ashishsingha@nvidi= a.com>
Sent: Tuesday, November 7, 2023 1:55 AM
To: devel@edk2.groups.io; quic_llindhol@quicinc.com; ardb+tianocore@= kernel.org; Chang, Abner <Abner.Chang@amd.com>; git@danielschaefer.me= ; Jeff Brasen <jbrasen@nvidia.com>
Subject: Re: [PATCH 1/2] EmbeddedPkg: Fix Android Boot Command Line = Length Bug

 

Cautio= n: This message originated from an= External Source. Use proper caution when opening attachments, clicking lin= ks, or responding.

 

Hello,

 

Hoping to get some feedback on these 2 patches this wee= k.

 

Thanks

Ashish

From: Ashish Singhal <ashishsingha@nvidia.com>
Sent: Monday, October 30, 2023 2:24 PM
To: devel@edk2.groups.io= <devel@edk2.groups.io>; quic_llindhol@quicinc.com = <quic_llindhol@quicinc.com<= /a>>; ardb+tianocore@kernel.org = <ardb+tianocore@kernel.org<= /a>>; abner.chang@amd.com <abner.chang@amd.com>; git@danielschaefer.me <git@danielschaefer.me>; Jeff Br= asen <jbrasen@nvidia.com> Cc: Ashish Singhal <as= hishsingha@nvidia.com>
Subject: [PATCH 1/2] EmbeddedPkg: Fix Android Boot Command Line Leng= th Bug

 

Curently, AndroidBo= otImgLib expects input kernel command line
to never exceed 256 unicode characters where the image header
allows for 512 ascii characters. If image header allows 512
ascii characters, similar number of unicode characters should be
allowed at the minimum.

Signed-off-by: Ashish Singhal <ashishsingha@nvidia.com>
---
 .../AndroidBootImgLib/AndroidBootImgLib.c     | 1= 9 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c b/Em= beddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
index 1359a66db2..02769cd0df 100644
--- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
+++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
@@ -321,8 +321,9 @@ AndroidBootImgGetFdt (
 
 EFI_STATUS
 AndroidBootImgUpdateArgs (
-  IN  VOID  *BootImg,
-  OUT VOID  *KernelArgs
+  IN  VOID    *BootImg,
+  OUT VOID    *KernelArgs,
+  IN  UINT32  KernelArgsSize
   )
 {
   CHAR8       ImageKernelArgs[ANDR= OID_BOOTIMG_KERNEL_ARGS_SIZE];
@@ -337,13 +338,13 @@ AndroidBootImgUpdateArgs (
   AsciiStrToUnicodeStrS (
     ImageKernelArgs,
     KernelArgs,
-    ANDROID_BOOTIMG_KERNEL_ARGS_SIZE >> 1

+   = KernelArgsSize
     );
   // Append platform kernel arguments
   if (mAndroidBootImg->AppendArgs) {
     Status =3D mAndroidBootImg->AppendArgs (
            &nb= sp;            =         KernelArgs,
-            &n= bsp;            = ;       ANDROID_BOOTIMG_KERNEL_ARGS_SIZE
+            &n= bsp;            = ;       KernelArgsSize
            &nb= sp;            =         );
   }
 
@@ -611,11 +612,16 @@ AndroidBootImgBoot (
   MEMORY_DEVICE_PATH       &n= bsp; KernelDevicePath;
   EFI_HANDLE        &nbs= p;        ImageHandle;
   VOID         &nbs= p;             = *NewKernelArg;
+  UINT32          &= nbsp;          NewKernelArgSiz= e;
   EFI_LOADED_IMAGE_PROTOCOL  *ImageInfo;
   VOID         &nbs= p;             = *RamdiskData;
   UINTN         &nb= sp;            Ramdi= skSize;
   IN  VOID        &= nbsp;          *FdtBase;
 
+  if ((Buffer =3D=3D NULL) || (BufferSize =3D=3D 0)) {
+    return EFI_INVALID_PARAMETER;
+  }
+
   NewKernelArg =3D NULL;
   ImageHandle  =3D NULL;
 
@@ -637,14 +643,15 @@ AndroidBootImgBoot (
     goto Exit;
   }
 
-  NewKernelArg =3D AllocateZeroPool (ANDROID_BOOTIMG_KERNEL_ARGS_SIZE= );
+  NewKernelArgSize =3D ANDROID_BOOTIMG_KERNEL_ARGS_SIZE;
+  NewKernelArg     =3D AllocateZeroPool (sizeof (= CHAR16) * NewKernelArgSize);

I think you can jus= t move the memory allocation code to inside AndroidBootImgUpdateArgs then y= ou don=92t need the additional arg for AndroidBootImgUpdateArgs.

Also Change Android= BootImgUpdateArgs (Buffer, NewKernelArg); to AndroidBootImgUpdateArgs (Buff= er, &NewKernelArg);

With this the code = looks simple.

thanks

Abner


   if (NewKernelArg =3D=3D NULL) {
     DEBUG ((DEBUG_ERROR, "Fail to allocate memory= \n"));
     Status =3D EFI_OUT_OF_RESOURCES;
     goto Exit;
   }
 
-  Status =3D AndroidBootImgUpdateArgs (Buffer, NewKernelArg);
+  Status =3D AndroidBootImgUpdateArgs (Buffer, NewKernelArg, NewKerne= lArgSize);
   if (EFI_ERROR (Status)) {
     goto Exit;
   }
--
2.17.1

_._,_._,_
Groups.io Links:

=20 You receive all messages sent to this group. =20 =20

View/Reply Online (#111230) | =20 | Mute= This Topic | New Topic
Your Subscriptio= n | Contact Group Owner | Unsubscribe [rebecca@openfw.io]

_._,_._,_
--_000_BY5PR12MB5544A102AE4728391133A5D0BAB1ABY5PR12MB5544namp_--