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 4B6BF78003C for ; Mon, 20 Nov 2023 19:33:42 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=2QL7qu+IRL1mTBApxTq07T2aSX4k8tMimP1vh/gyqGU=; 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=1700508820; v=1; b=e4vrOT11VJbI2xJYJ2PNz44PFkJeYyUBwyDzs0tBxBczPLpDxOfLjL9gBQl+5SpsTiEPi/wH nRYeFIS19NVE7YzLr9XYPGccKHkr5A8ZzqB/52OV7ZsBgoX/iX9SV/JQjFy1DwK+fSvKg/qaNEL CZOk6boJ8iD7LLCej0Sc5ATU= X-Received: by 127.0.0.2 with SMTP id zJmyYY7687511xEVbP2nAhIx; Mon, 20 Nov 2023 11:33:40 -0800 X-Received: from NAM04-MW2-obe.outbound.protection.outlook.com (NAM04-MW2-obe.outbound.protection.outlook.com [40.107.101.56]) by mx.groups.io with SMTP id smtpd.web11.10666.1700508819982594419 for ; Mon, 20 Nov 2023 11:33:40 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZwIcCoHm+R/zNpnc+fQobk3F6mzTZ30EeMc6q1dIdbERX+na+n7lrLsWFnAJbfJPkD9l1/BluifzAmadhNe1Zkvpxqypl//tnG5gJyQxQZvn0rqQUW3hLavi4sas2DOcgkFfCt7r3Eat1qjsqT5pHW56pzeZslIvxwpNZBTUVKnTBMmutrKuTeqgfE6+v7XBKUbHwyjhTx3SZr95o6zBI+kS4Zjc9qWURU7bGUCw+rWj+FLAZOnMRtEf5Fg7TuTi/DHHhxNfxXUz/GVGddNeIlYCVTh4/QhLwf4Wwj7FFVOmLvH2ISEnK4C4oxVBDvVgtMEoWrkVIK4rOAvA2wHGEw== 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=Es+IneqWYhvhU5soXE8nbxUk8X1u4x/Iyl/d0PJIfkc=; b=ZjmM00afktga2a2qk++lxCFkHwBzXYxDc+KXtuRMHrQkUzIp3j8vPwCULH89c/qyTHjN11VifPa/1mGusYsW6DP/0xADwqBOw8YGkVWJJBGB12d19ac7UOEiqETCjDYbriMfJRQRBnAN4pvhuK930hmZ/8fLnIopXfOS1G0YC06K8ALFf4F/y4mssBtU1ek5x2Nla/fReNrbE8BWPYd+W4Bn8BZvK2QII5Z86Q10u4fIEWL/oWT1Xk5ayvyaDyjGz00DHFsLQEcqzYDsrmWfeXoMIlj3KC0teoFFKDseJ3rnKQGe5Lf0zZ0MiX1xJU4wN57q6UexozY9RqpDbCNqrw== 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 CYYPR12MB8870.namprd12.prod.outlook.com (2603:10b6:930:bb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.27; Mon, 20 Nov 2023 19:33:37 +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.026; Mon, 20 Nov 2023 19:33:37 +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 v2 1/2] EmbeddedPkg: Fix Android Boot Command Line Length Bug Thread-Topic: [PATCH v2 1/2] EmbeddedPkg: Fix Android Boot Command Line Length Bug Thread-Index: AQHaF3GVaLL9rqM9m0WkO4ZgZ9RIwLCDJvcAgAB5hWc= Date: Mon, 20 Nov 2023 19:33:36 +0000 Message-ID: References: <3ab879ada6d9f2b01496ecc05102510564888044.1700008662.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=74420a64-4491-43ab-8ad2-466d2ac8796a;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-20T12:08:47Z;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BY5PR12MB5544:EE_|CYYPR12MB8870:EE_ x-ms-office365-filtering-correlation-id: 970b0dca-fc8e-47e2-735c-08dbe9ff9770 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: O5rguRWcczjJ4bGYikHPNbxBtz1qzs79YXy0aRWP8N+ceCLbre/i+hGoCaJ9ALlNHiAK8Ftg/yloFZDA4UsbWfsa9hFeh91W5OeG56Svjz8Wh0Ro79WoGDgnuRoM7XKMMNXcX+Q7xcep48cu5jm0fa8zr+cZTVf3L6iMAy9oahsdFdiWj3CdDJqVG0xRh+faElCALgg92DRe3pvyxeKKhJOinWw2s1Mi1Gel3P1l4q/17JpJeEWLGF/hjeM58QIvUjTGUBp25FQ7scaEFngv5bOK65jYwX9SWMw405BB9/4AF/Oyo7Py8ikei8MT8ym+E1zulF+nSz51BRZpkBMjN/8LEhTVIrvghpFLcRMW3wzISPMedpXuuVocH1PsunumCPHrN/5jmEBFdIxbgNTzPLVCl5G6jAssLHd0tePxYdZAWCYqwCx/V8/lwmuxTY+IMDXqJRPT+JwBGiLfW+ULUevSwb7hoxNfYW8STx9tIlQQrhiEElVRsvhzCrtMiUWWmzoeD0TtfjMIQyU+jBmAeWolfhfQ4zkxwovIkHYalDgW1LoP8OPlCB4LwXBEYpk40gxMfcU/2L1kDe3eK7ke9OgJl63MdtA4PldEufyLduQ/lHi6BzEsiYLEVEamT3bVU418dI2NCG5jHsKFbJSU6Q== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?8yuaQCaDoBoe++uQJXGEfH7DDgLlYkVtrhXdW25EthtuiVkna3TcRJZd+N?= =?iso-8859-1?Q?16KCD4QfC6VEmmKPkyyL/m812yWj007F6e7ytum80APtnxEiQxezj1pZZc?= =?iso-8859-1?Q?NO+NRA1+rntIF4kdWMNM5BFKnIXQ5N6uMqpCa5LBZbTBbfxTw3xfOfObjR?= =?iso-8859-1?Q?Lwo9dh5cdSgFnpZkV/QKC+n+WZ327fe/zIvEmdod5ac9gKv4HGrXuOdLzB?= =?iso-8859-1?Q?5R05jL5MdaTLCUc98DfUxJBjoazHRXxriK3Qo2czA14LyL53cGfJO2LJaB?= =?iso-8859-1?Q?cO3MlMPfUMoxrkYqBZEWfVIdT0uMyeD0LAkMqx1dIUl444ezUIovSgQKvP?= =?iso-8859-1?Q?ZTFuiUyDeq+2GSZzhHxjVIDok5ruMd1twi05fF1E8xbo5NbLiY+caY75K9?= =?iso-8859-1?Q?/uASu85ekTTtgjQefzZF2nrAgHfSDHQdzLjhglOlUmXAAhXIqF86CRESMl?= =?iso-8859-1?Q?cSKnw9cEbwbVDUeZJTirOb1xoQ5lQmHhn6DgSb7O8xEdzRo246HvCcePFt?= =?iso-8859-1?Q?+D6LObKV1PyxtEfRnRXqMFcIgqb0fmRdzmxwowO1W8rGgAdupab2tHf3Ns?= =?iso-8859-1?Q?vS7WetPVv4W4LaS6OaJ3zl7UXSJreiTZFqyfaPnaYTBuDBWFh5mIDE/z+K?= =?iso-8859-1?Q?a2GOx7VhUzdMuhLIIWlvJmjTdtAtDMfAKLsWwq7HapGTbc2sZSmJXrRVOh?= =?iso-8859-1?Q?XzXSas4CYj/0mYfxcPdOol43QyXcpJG1aRhSnC/WtFP/sfADAS9a9XjCAu?= =?iso-8859-1?Q?GZcXzMzLctEWmwi3aVwPnPeNiu0bEyfqQL+0bXvDdq7HroxzemzhDjRDNS?= =?iso-8859-1?Q?LXX2I+TXivan7mpucQcBykjun48UXKlprjYGeakBXx42c9ulPYvXgMrIJT?= =?iso-8859-1?Q?ebQ6+UcmU/ZiHzK4PdOgNwFkY7pBDZCn2qlO5/2Qfa/XE2wf15Ji93qOeb?= =?iso-8859-1?Q?+uJ2fp5V02RAl3OgLRWWUChW1SPqAVjR2DcTGHVjqdJ6WPaQlXYK2Fz1DY?= =?iso-8859-1?Q?fcs5AbUEt1oMW4LtsAsAdhxSiqvKc2mNTa0DpSX+kBYN5w5px6SdYMPDQy?= =?iso-8859-1?Q?fzRDjvyENOa3H/FZ290g31fi0MnFKX0uGQDzpiVVUrIb+71oPCFI4N/59X?= =?iso-8859-1?Q?q1WyznVPSK28LSA35RTZAn7MdE4ff2/r/7zZK2w/Y6iqk/doeH3hNazw4v?= =?iso-8859-1?Q?7KYpnCupQ4qIBhLGdKS+LekyErcKNCLOUe50GlfccrJOthvDk1eDF3qhPX?= =?iso-8859-1?Q?AhPVR94EdDsLP2ITyM9097vCVlY5tIINSWymTJX9vziYyFDpmRmKLTUsqu?= =?iso-8859-1?Q?DeWbD/lek5ul2Lc4jrbbwqe8GhmbPyRSJ7Szdq5E7uBY165vFg8k559eLd?= =?iso-8859-1?Q?lyTLFxlQxsBki7TDsRzA8OJKZs2A3NE3eq0YUU7bRIFEXK3Wd552lvhrKa?= =?iso-8859-1?Q?KZjVciUXNvpYSy81k54EJXSEJ612AIxdSsbpct62SFs/wJ1mADHgtN69+m?= =?iso-8859-1?Q?9X91wAt0qlJFym4fzdmnNI/+aINsGA4g0THwekl+gJIh4YQi6aP/3C9ltB?= =?iso-8859-1?Q?+RKAo/nad1n3mY992mXRfkgxe/TsHGhIWOdCZwaYkr5lALDZhLDYn7D0Tq?= =?iso-8859-1?Q?EYXUkKSwKqEx1OU9FazcmLq4upAzpfk1gI?= 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: 970b0dca-fc8e-47e2-735c-08dbe9ff9770 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Nov 2023 19:33:36.9200 (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: s/30yulfdsNs5hh6wrfZ2fPkaGKcNaOCQb2FsZ2DwLoD+kAO7VJ7c71Sn1OlMav2i+2/SLxCAtQzxdRA9ZtlWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8870 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: I9BFMHinWoZBg36iDCWMZ4t4x7686176AA= Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_BY5PR12MB5544C3862D671BE2743F1E6CBAB4ABY5PR12MB5544namp_" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=e4vrOT11; 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_BY5PR12MB5544C3862D671BE2743F1E6CBAB4ABY5PR12MB5544namp_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable ________________________________ From: Chang, Abner Sent: Monday, November 20, 2023 5:13 AM To: Ashish Singhal ; devel@edk2.groups.io ; quic_llindhol@quicinc.com ; ardb= +tianocore@kernel.org ; git@danielschaefer.me ; Jeff Brasen Subject: RE: [PATCH v2 1/2] EmbeddedPkg: Fix Android Boot Command Line Leng= th Bug External email: Use caution opening links or attachments [AMD Official Use Only - General] Thanks for this update and two more comments, > -----Original Message----- > From: Ashish Singhal > Sent: Wednesday, November 15, 2023 11:12 AM > To: devel@edk2.groups.io; quic_llindhol@quicinc.com; > ardb+tianocore@kernel.org; Chang, Abner ; > git@danielschaefer.me; jbrasen@nvidia.com > Cc: Ashish Singhal > Subject: [PATCH v2 1/2] EmbeddedPkg: Fix Android Boot Command Line > Length Bug > > Caution: This message originated from an External Source. Use proper caut= ion > when opening attachments, clicking links, or responding. > > > 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 | 31 +++++++++++-------- > 1 file changed, 18 insertions(+), 13 deletions(-) > > diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c > b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c > index 1359a66db2..f63648e60d 100644 > --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c > +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c > @@ -322,11 +322,12 @@ AndroidBootImgGetFdt ( > EFI_STATUS > AndroidBootImgUpdateArgs ( > IN VOID *BootImg, > - OUT VOID *KernelArgs > + OUT VOID **KernelArgs > ) I know the original code doesn't have the function header. Would you mind t= o add it as we change the prototype of this function? Or you probably would like to keep it as it for the consistence, as no func= tion header for any of functions in this file. I did not add this intentionally and even sent out an email asking the same= on edk2-rfc if this should be done by maintainers unless you want me to do= it as a separate patch set. Link to the message is https://edk2.groups.io/g/rfc/message/827 > { > CHAR8 ImageKernelArgs[ANDROID_BOOTIMG_KERNEL_ARGS_SIZE]; > EFI_STATUS Status; > + UINT32 NewKernelArgSize; > > // Get kernel arguments from Android boot image > Status =3D AndroidBootImgGetKernelArgs (BootImg, ImageKernelArgs); > @@ -334,16 +335,23 @@ AndroidBootImgUpdateArgs ( > return Status; > } > Do you think we have to check if the ASCII string size in ImageKernelArgs g= reater than ANDROID_BOOTIMG_KERNEL_ARGS_SIZE? Thanks Abner String comes in from the https://github.com/tianocore/edk2/blob/master/Embe= ddedPkg/Include/Library/AndroidBootImgLib.h#L43 header so it should ideally= be self-contained. If you still think we should check for it, I can add a = separate patch while keeping this one unaffected. Thanks Ashish > + NewKernelArgSize =3D ANDROID_BOOTIMG_KERNEL_ARGS_SIZE; > + *KernelArgs =3D AllocateZeroPool (sizeof (CHAR16) * NewKernelArgS= ize); > + if (*KernelArgs =3D=3D NULL) { > + DEBUG ((DEBUG_ERROR, "Fail to allocate memory\n")); > + return EFI_OUT_OF_RESOURCES; > + } > + > AsciiStrToUnicodeStrS ( > ImageKernelArgs, > - KernelArgs, > - ANDROID_BOOTIMG_KERNEL_ARGS_SIZE >> 1 > + *KernelArgs, > + NewKernelArgSize > ); > // Append platform kernel arguments > if (mAndroidBootImg->AppendArgs) { > Status =3D mAndroidBootImg->AppendArgs ( > - KernelArgs, > - ANDROID_BOOTIMG_KERNEL_ARGS_SIZE > + *KernelArgs, > + NewKernelArgSize > ); > } > > @@ -616,6 +624,10 @@ AndroidBootImgBoot ( > 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 +649,7 @@ AndroidBootImgBoot ( > goto Exit; > } > > - NewKernelArg =3D AllocateZeroPool > (ANDROID_BOOTIMG_KERNEL_ARGS_SIZE); > - 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); > 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 (#111488): https://edk2.groups.io/g/devel/message/111488 Mute This Topic: https://groups.io/mt/102598724/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_BY5PR12MB5544C3862D671BE2743F1E6CBAB4ABY5PR12MB5544namp_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable


From: Chang,= Abner <Abner.Chang@amd.com>
Sent: Monday, November 20, 2023 5:13 AM
To: Ashish Singhal <ashishsingha@nvidia.com>; devel@edk2.= groups.io <devel@edk2.groups.io>; quic_llindhol@quicinc.com <quic_= llindhol@quicinc.com>; ardb+tianocore@kernel.org <ardb+tianocore@kern= el.org>; git@danielschaefer.me <git@danielschaefer.me>; Jeff Brasen <jbrasen@nvidia.com>
Subject: RE: [PATCH v2 1/2] EmbeddedPkg: Fix Android Boot Comma= nd Line Length Bug
 
External email: Use caution opening l= inks or attachments


[AMD Official Use Only - General]

Thanks for this update and two more comments,

> -----Original Message-----
> From: Ashish Singhal <ashishsingha@nvidia.com>
> Sent: Wednesday, November 15, 2023 11:12 AM
> To: devel@edk2.groups.io; quic_llindhol@quicinc.com;
> ardb+tianocore@kernel.org; Chang, Abner <Abner.Chang@amd.com>; > git@danielschaefer.me; jbrasen@nvidia.com
> Cc: Ashish Singhal <ashishsingha@nvidia.com>
> Subject: [PATCH v2 1/2] EmbeddedPkg: Fix Android Boot Command Line
> Length Bug
>
> Caution: This message originated from an External Source. Use proper c= aution
> when opening attachments, clicking links, or responding.
>
>
> 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 <ashishsingha@nvidia.com>
> ---
>  .../AndroidBootImgLib/AndroidBootImgLib.c    = ; | 31 +++++++++++--------
>  1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c=
> b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
> index 1359a66db2..f63648e60d 100644
> --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
> +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.c
> @@ -322,11 +322,12 @@ AndroidBootImgGetFdt (
>  EFI_STATUS
>  AndroidBootImgUpdateArgs (
>    IN  VOID  *BootImg,
> -  OUT VOID  *KernelArgs
> +  OUT VOID  **KernelArgs
>    )
I know the original code doesn't have the function header. Would you mind t= o add it as we change the prototype of this function?
Or you probably would like to keep it as it for the consistence, as no func= tion header for any of functions in this file.

I did not ad= d this intentionally and even sent out an email asking the same on edk2-rfc= if this should be done by maintainers unless you want me to do it as a sep= arate patch set.



>  {
>    CHAR8       ImageKerne= lArgs[ANDROID_BOOTIMG_KERNEL_ARGS_SIZE];
>    EFI_STATUS  Status;
> +  UINT32      NewKernelArgSize;
>
>    // Get kernel arguments from Android boot image
>    Status =3D AndroidBootImgGetKernelArgs (BootImg, Ima= geKernelArgs);
> @@ -334,16 +335,23 @@ AndroidBootImgUpdateArgs (
>      return Status;
>    }
>
Do you think we have to check if the ASCII string size in ImageKernelArgs g= reater than ANDROID_BOOTIMG_KERNEL_ARGS_SIZE?

Thanks
Abner

String comes in from the https://github.com/tianocore/edk2/blob/master/EmbeddedPkg/Include/Library/A= ndroidBootImgLib.h#L43 header so it should ideally be self-contain= ed. If you still think we should check for it, I can add a separate patch w= hile keeping this one unaffected.

Thanks
Ashish


> +  NewKernelArgSize =3D ANDROID_BOOTIMG_KERNEL_ARGS_SIZE;
> +  *KernelArgs      =3D AllocateZeroPool= (sizeof (CHAR16) * NewKernelArgSize);
> +  if (*KernelArgs =3D=3D NULL) {
> +    DEBUG ((DEBUG_ERROR, "Fail to allocate memory= \n"));
> +    return EFI_OUT_OF_RESOURCES;
> +  }
> +
>    AsciiStrToUnicodeStrS (
>      ImageKernelArgs,
> -    KernelArgs,
> -    ANDROID_BOOTIMG_KERNEL_ARGS_SIZE >> 1
> +    *KernelArgs,
> +    NewKernelArgSize
>      );
>    // Append platform kernel arguments
>    if (mAndroidBootImg->AppendArgs) {
>      Status =3D mAndroidBootImg->AppendArg= s (
> -           &nb= sp;            =         KernelArgs,
> -           &nb= sp;            =         ANDROID_BOOTIMG_KERNEL_ARGS_SIZE=
> +           &nb= sp;            =         *KernelArgs,
> +           &nb= sp;            =         NewKernelArgSize
>            = ;            &n= bsp;         );
>    }
>
> @@ -616,6 +624,10 @@ AndroidBootImgBoot (
>    UINTN        = ;            &n= bsp; RamdiskSize;
>    IN  VOID      &nb= sp;            *FdtB= ase;
>
> +  if ((Buffer =3D=3D NULL) || (BufferSize =3D=3D 0)) {
> +    return EFI_INVALID_PARAMETER;
> +  }
> +
>    NewKernelArg =3D NULL;
>    ImageHandle  =3D NULL;
>
> @@ -637,14 +649,7 @@ AndroidBootImgBoot (
>      goto Exit;
>    }
>
> -  NewKernelArg =3D AllocateZeroPool
> (ANDROID_BOOTIMG_KERNEL_ARGS_SIZE);
> -  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= );
>    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 (#111488) | =20 | Mute= This Topic | New Topic
Your Subscriptio= n | Contact Group Owner | Unsubscribe [rebecca@openfw.io]

_._,_._,_
--_000_BY5PR12MB5544C3862D671BE2743F1E6CBAB4ABY5PR12MB5544namp_--