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 6AEECAC0954 for ; Tue, 21 Nov 2023 01:57:13 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=giAfQTnntM5Xhu0OVqhU70LlcIf3mZW9OJ42Li530wI=; 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:Content-Transfer-Encoding; s=20140610; t=1700531832; v=1; b=cpD2s50G+ERp4A9gpmY2Z/tCfRar0zXa5iYrSnP5qQEkVAJvK/HhzKT+5l4sEiCJDUgBdoWO VoLYwY7SpxKeuhx+P9Vqwq/djOm2xGDWFjXztqyPNRBHjCUAbgAIafo8xr0ewXz6jzH1uJKUMWN idToCZOZk9X4zQxmxiitrxYY= X-Received: by 127.0.0.2 with SMTP id opd8YY7687511x6xznuBQ2M1; Mon, 20 Nov 2023 17:57:12 -0800 X-Received: from NAM04-MW2-obe.outbound.protection.outlook.com (NAM04-MW2-obe.outbound.protection.outlook.com [40.107.101.80]) by mx.groups.io with SMTP id smtpd.web10.25513.1700531831143169745 for ; Mon, 20 Nov 2023 17:57:11 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NU09rLEONFKAB20epW9TjQXb/xGG++zneSRC1VkePG8R13BXxdZXx2d5wUJPGPdTmdNnh6rzl4gTD0kZe1IMMRLRHZjILm62sJmynhJUSs19F1Vf70tA/20xqpahDyLBYvAPVroFp3yg5teV+fH/uWDY9BnlK2ju0CUWE7vhWUcVxBTvF5X8xNBpc0yXi2gAfY0P7r508jLgP5uwKC6DbAnRIJHDOsDJCciEwRiw0q8TmBG3juUGCXC6GPPxh/LXd15vYCTk8rmLUtKPU1NUztBjG1Hc6rk46v0QSqQY9gX7D2RZcxrjzhOSP/dgeHVO55aZACF4EPxFUxICz/FmzA== 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=PHzk4SQ8yjFvXtZ1tok5fjfzyvlEyo+uudTQx4iD6Lk=; b=Fd2N142YRGHlrjAp8Ms4mQyc4syWHWcyx8cWP90LCa/yAxxIhIFAN6bnjf3aKq723qSKDFGhsL4B+FdbCRhzwYdElODdif8DqAogrzC9X4AMcZSos+V25zXd1k1RTpCbydx7B/OFR9xKXvtvqy8Xvf7wgJWyeobb8qlwnKTeLmroRocEobg5jBvsQDBuy8DKYarunmg4UG5AuwWYVHqWcmyGIDFvkrwjDke3d1U8D22MddyaE/oDQpPmfiuA34XzXyCvCeSDgN+ywyYoahCHuVoMYStVEG0Q+msgvg7G8UGvbWgg8SCI5KufFOBAJrC0/aTfIP2JnGdcj9MI1i6YdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from MN2PR12MB3966.namprd12.prod.outlook.com (2603:10b6:208:165::18) by IA1PR12MB7709.namprd12.prod.outlook.com (2603:10b6:208:423::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.27; Tue, 21 Nov 2023 01:57:07 +0000 X-Received: from MN2PR12MB3966.namprd12.prod.outlook.com ([fe80::91d9:e679:32a3:dd05]) by MN2PR12MB3966.namprd12.prod.outlook.com ([fe80::91d9:e679:32a3:dd05%4]) with mapi id 15.20.7002.027; Tue, 21 Nov 2023 01:57:06 +0000 From: "Chang, Abner via groups.io" To: Ashish Singhal , "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: AQHaF3GYlWbIQ8+McEGjG/g0U9xKYLCDJb1QgAB8SACAAGqn4A== Date: Tue, 21 Nov 2023 01:57:06 +0000 Message-ID: References: <3ab879ada6d9f2b01496ecc05102510564888044.1700008662.git.ashishsingha@nvidia.com> In-Reply-To: Accept-Language: en-US, zh-CN 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: MN2PR12MB3966:EE_|IA1PR12MB7709:EE_ x-ms-office365-filtering-correlation-id: 6170f793-675a-4fee-1e2f-08dbea352a4c x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: 9k/sBqcGkYZyDjPKG+1TFfNRW2CXMedeazXgI3JI2LjuaMdxD4hLtFBPBZLiUU+c3hzXEhUefU9wONxMgIOX2UZ0T8BGVgEvwFKRi3qEw9/VIY577Hc+uUggEymkfVgKXYj/oYPq7pRaaRPunsKXf5LUbjWUUSrvwoJOBFYgjprIXH3539vTLv+f3vfrJQMSBWXZE+akjuAOFD0RfQ3EVZGocN2QfE2iGTjR20TUjIl/ct5CHdlvyuW+YAUM1ib133naCYyTT1h9gbDBzoZlh+wkL9ZzIUxyn+8Ss2uTkv2zRr9tTvxJTZKi+rUmMYUOdh+AZcdV+PH1y1PGI2UyPm7yy+/Vj6ellUEqqyKmIcijRB/G57ASeNgCvgoVNA1gD8Hcb9tL/cy0/tT9W0vYCrOuqaOCCFfBCusZ2D5Bgph/pqViLKsmqTxQXIJWAHX13YojfoasrnTZ2ZLwarA0XPexoH2g1lTQ3jK5K5J95LNLqw+q3/daGaE3tk3JCY5yA2taPTYx71CEQEM14yj0FeGhaJwgUr3ipkEzHDSWnrIAGZ9xN4v5eTx3I1DVFOhxhmEDwSAS450qCUEXFDM/WsnmbugFUawUYRRJZ2zTypcOpCHI7fgZ7thlbWu2Qx50EoeDHcRKA39pIP0PkVRJ+g== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?NYF+1MQnlQAVCpMnUUKO7xKjLGTjdQqWLtXdk5ruuXmZ4KS/mI3uLCXfNJ?= =?iso-8859-1?Q?tHbzykzL5063nXOVeEarKw+uUBXI1aL80TfsAnwWHM0FCDo85S3WyilQa5?= =?iso-8859-1?Q?3r6a64rhE47hiUF6I3Wm/JaMfe4WughP4HqlFoIP94QEihpQb6eLYlJu2J?= =?iso-8859-1?Q?S08GCmRcT5s/pJiKaRJLcBKlGY70uVPcsLkIjMadLJMb41t7aMwgVhEsOq?= =?iso-8859-1?Q?zB4dNgbMKFuwtihJvN6+y70L7U++zuwEBvAlHFzhOMd6jCQb803ckdjJmI?= =?iso-8859-1?Q?cqEuOxIQddL8m6r+zJ/eHAAIU8JhqT4KFPZuEmptCDuIkejNevQRrtIlCT?= =?iso-8859-1?Q?LzjTdTFrw3AuM1hF1McILbWzgOA0nk1M0pMafxqG1NRI9CZinU2Q8nuxhn?= =?iso-8859-1?Q?XGztkBDC16KEX935FwOqbADh1CJ3obs/sxH4dWJaGtLfL3VmE7nFQ8UM3M?= =?iso-8859-1?Q?nZjDn0Je6y9bwwcmqmPXT/aG+SgglMFCGKePDyWXKm6tU9kvOqZvB9YEsh?= =?iso-8859-1?Q?28iIcL5ji28H1v/vDU/BHcQhPHRGVmTRNiq7+SMiVIBJDEJ21g3g4qEHq1?= =?iso-8859-1?Q?wkXRo7KmC/mmA1xueZAU1tNX8j4ZmiLXIZ+7RTutMb/s41HHyS1z7jfDif?= =?iso-8859-1?Q?vix0YHVm/VZfWSDyj1dW8ZUzFSyK4okB6KOdHPIzljhqaUHM/Tq+4aW8pF?= =?iso-8859-1?Q?q/EbMzTm2ps2Z61K6spu6QObXkuLypwC5X0024qi9Wh5w3QKP3+yeP2sYe?= =?iso-8859-1?Q?95THbNfpjK6PkUT/IqO0VOIfeGwhrWANdKPzAeolHbxUb2VOR2lEtxc53O?= =?iso-8859-1?Q?m0i9xNriBxPuvFm87T5sfeIhN1tTO4Fo6PDxdP/G0L1vTCrrXSMjL3Aqux?= =?iso-8859-1?Q?9sEdiXr/IRYmH3nwA3SjVRoXjeL6Piz9BRoD7Mbzyr6aARZEJsgC2s36i6?= =?iso-8859-1?Q?35GqzS+bOOpB5Ips6BKRxBPL9J0mjKCr2mOJ0qHErl9Q0sbb7rLN5pXpwk?= =?iso-8859-1?Q?Mf7lTIGIneMhvbWR+fxOra4DKtMWC7X1RZ/EQU/7UKEwEUK9cvzAFnrvqI?= =?iso-8859-1?Q?rnQOLmt3lp1mbFGz5NnLnmoe5H+wwbmuttBE1OZt9jEiXqLeh5mFJx9tz1?= =?iso-8859-1?Q?Jj+IHA8KLAxNTwSa5zYk3mrtDsMZaNdzlwQFTHqJx2KI+nQ5SPSeRjrPvk?= =?iso-8859-1?Q?2qL0ceYexwIkShBxUhgYyekk+GFFRrIqIMu9mVRiyNfdMTHDhDcl7krXAo?= =?iso-8859-1?Q?O4pHZFt7osLzaevn2lbQcdWX+WJ0WMvmTPEccND0EQzc7h5YHNAPApfAQv?= =?iso-8859-1?Q?s7rmARi7DBc80HCJYtPNATvz43vW50MZ96BfgfhTTYiyAzdRvHgix0h4w4?= =?iso-8859-1?Q?+WX6czrIPXINkqxwgClrlRQvWRCP2ZwSEqL+ojodEA3KzgTx+Tf4DGVdLh?= =?iso-8859-1?Q?QnzaZKe257c/LHA5Ag28SETSR2zkAIkN4EqYAcFem9W8XRsS/F9kz7bvE3?= =?iso-8859-1?Q?B3lhl76MmNUFMEJ7OyUlher6z57kA1lyOwc3WZBGDRMDJEJ/ItelHCSL4q?= =?iso-8859-1?Q?WHxLJdI6gQh3KS54nlvufhNesmWtoO0Byq+q0F8uklsq7RIcw61YCi5kEx?= =?iso-8859-1?Q?sbtevf7EdJHGQ=3D?= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3966.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6170f793-675a-4fee-1e2f-08dbea352a4c X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2023 01:57:06.5094 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: PIoZTlSjj0kN70YGzckEeRU2Yc4e7nnscfkAlqKwmBk555FAFRO+o4lQ/ga/2E+EhCwH1rs7VA5dB+U12Qla2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7709 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,abner.chang@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: JIdcZu8ShWGcUMNgovjheLZpx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=cpD2s50G; 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 [AMD Official Use Only - General] >I did not add this intentionally and even sent out an email asking the sam= e on edk2-rfc if this should be done by maintainers unless you want me to d= o it as a ??separate patch set. >Link to the message is https://edk2.groups.io/g/rfc/message/827 That's fine. > String comes in from the https://github.com/tianocore/edk2/blob/master/Em= beddedPkg/Include/Library/AndroidBootImgLib.h#L43 header so it should ideal= ly be self-contained. If you still think we should check for it, I can add = a separate patch while keeping this one unaffected. Reviewed-by: Abner Chang Abner From: Ashish Singhal Sent: Tuesday, November 21, 2023 3:34 AM To: Chang, Abner ; 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 [AMD Official Use Only - General] Caution: This message originated from an External Source. Use proper cautio= n when opening attachments, clicking links, or responding. ________________________________________ From: Chang, Abner Sent: Monday, November 20, 2023 5:13 AM To: Ashish Singhal ; mailto:devel@edk2.grou= ps.io ; mailto:quic_llindhol@quicinc.com ; mailto:ardb+tianocore@kernel.org ; mailto: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: mailto:devel@edk2.groups.io; mailto:quic_llindhol@quicinc.com; > mailto:ardb+tianocore@kernel.org; Chang, Abner ; > mailto:git@danielschaefer.me; mailto: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 (#111496): https://edk2.groups.io/g/devel/message/111496 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-