From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3958BC433EF for ; Fri, 17 Dec 2021 23:20:45 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 509D5837BD; Sat, 18 Dec 2021 00:20:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="2p3B9Spm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 29325837C5; Sat, 18 Dec 2021 00:20:41 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0615.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::615]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3FA1283799 for ; Sat, 18 Dec 2021 00:20:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d65ZjfaPf8P9k9HcJ74wF4gIzDDuJCZmhx6WX6cnX5dzjUjQxmDU3U+Az2bBf9wa5CyT+Boszmk77ss16/Ie5jkog+dbHTDMeWcceGXy6qW2wzbYDvt2J7XbPa1eZD4uC264VGvEOfNsT76Hn1PzwZL/Gr0RVsUtznw69mYTPa1wjVtuYq4jMbLlyOijhUaQVozH9xn/CfSh9Ap7QhAjaXDbVmWS80Dtc1TEWzLaGmbt7k+XR7kdg9R1BbW9FL1bizyMLMjq9E5N0mWtb1AZHNM42/XE1sgoAHea8wIKVatrG7mHGGaPeuZycF9+4xrEXEVJBG43iZYNvfD0MWJgiQ== 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=zW6DpgcgLsdBVKaR/6mw/sr+81ljvNrkhSsikKSCpPo=; b=b6065fWcb8GWP7ko5wt1vXqGiM64xTLMzqUYhIT7vlDF9ojjERJGKdZYxTALmr6rItaMf2+V5gOAMeuS5RuOQ/ONuCHsigWhmp8v8malG4qTSUfBo14RXf0YCFSj5sYyTQSLKwj/vi9UsYp8F0UIfhVoYUKaRVHwKJsNZU9f/aLMq2uJqjhHH4w8moGfRglB7FrtLhLuLsLe8wA0dckvs1vhYRaa1T32vXn1xrrjfppsLhCL5K2hk1OK/y3ftaiIYIfHSbdWUNzWa9B3lrEZy7c8NemVXx0VH1eP6vVRDXw4fD9J0iTtAo1X9PYLfXjiMQiwiv3hnXA6TsyGR7sYsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zW6DpgcgLsdBVKaR/6mw/sr+81ljvNrkhSsikKSCpPo=; b=2p3B9Spm0hWQBnOCZ/UAFsKosMUU03OZd34ZdXbMnBGNFm9dOCCkH3NOuaLlmzRInPGYrGSDHjfoShKmEJ8hgYO2Mrkp8YD1H3fS2EbFUhuczgZNrcDTi5vIbe0jgihMk82JstUMuoKWKy9OiAKt7UB83ulFVeZgMl5m2C7X0gc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB9PR03MB7275.eurprd03.prod.outlook.com (2603:10a6:10:1fe::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Fri, 17 Dec 2021 23:20:35 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4778.019; Fri, 17 Dec 2021 23:20:35 +0000 From: Sean Anderson Subject: Re: [PATCH] fastboot: only look up real partition names when no alias exists To: Matthias Schiffer , u-boot@lists.denx.de References: <20211216102638.111391-1-matthias.schiffer@ew.tq-group.com> Message-ID: <5759d408-e876-9444-d14a-22bb37aecc14@seco.com> Date: Fri, 17 Dec 2021 18:20:31 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 In-Reply-To: <20211216102638.111391-1-matthias.schiffer@ew.tq-group.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: BL1PR13CA0352.namprd13.prod.outlook.com (2603:10b6:208:2c6::27) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 08469d6d-8fe3-492f-4e15-08d9c1b3d42f X-MS-TrafficTypeDiagnostic: DB9PR03MB7275:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1002; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eoOR+STlBRF3kG1Ma4OarO/tsAckeJbfQGVRn8k2+B+SL+vR7SN1dBmXz3FeoEmneoDeiGniuEoNQFkFly+/rLY45EQTaYmiCPU9SvypRrrssjDV7RmPcMiHc5HTjgTFSsY6659nghRns1uWUP2YLdfjaqlw/qc87pOLQF6Nv+wUm7Xk08IvHUA2B4Ye7LzaRkimqvLZ8v3dWCkA6hJU4VWEN2zYg1u7g09n+lLrOgzZYY1tS/YczXtB7lS2CSgpTBAVOjlGTZ8eEbdGNUpqtxULQiRqLBcKN5FpmSYJKztQAiBiLhDq2NF5wo0Thme7BhGHOTU53HIqEqSHpuhDhG4vA9kHHxahz1r88k5rIhVBUPtdmcLvZMpONKsnhe+Kqkmq6DJ+TNwUZ69EyJnzBA8ZQQ9rwcOsFl+mTuf5lGRD1qK3ZZGH+wpV1P5Lo75LCOzwM6HsjYx3yVYSnbIe2kosiUHF70ZFtH//nzzEkz82rENY4W2DmhdLqZKD4DbXDzGyAisLZhQXGa6myiFADP70TAdPvrz8zFPsu7MgOF8yEluYZy+ZvqaqO4M2KIcwnNHgFMaLpTCndRaRiW/2H3he9F736KTtIGw21ju0xXc18UyGuNhq2Ul5Qk7xRdnou7idZFPyM0UU4T7k/P+N3RwJL4A/mY2sC7VsCRlinOorH45zZZj9WHbAMjAEMxlbqbrc+x0RNFylpRVDBkDqu8xxzPBy56z1VX2TObR9qTFVPyyTiSmrorXHp62hlVwx4CevTWhdwjEqSQQnVy+l7g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(6506007)(26005)(6486002)(66946007)(2616005)(52116002)(6512007)(66556008)(2906002)(36756003)(8936002)(66476007)(44832011)(5660300002)(83380400001)(316002)(86362001)(31686004)(53546011)(6666004)(186003)(8676002)(508600001)(38100700002)(38350700002)(31696002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cTJtcE9ReGRQcDdhMEJhYkRwWHNPN1Q1ZC9RYUNqazRYLzA0Q0ZGSzVtNXlD?= =?utf-8?B?cVhNVk5mS1dUUjViVzhXVzFhL2NBZXhBL21ZRzhQdVE0azFjZ0pLL3ZMaUlp?= =?utf-8?B?RitRV0xFNG9YbTJkb0c2cVNjdW5Ja1NuZnpINmh5andXUTN5VTZEdmNBR2t3?= =?utf-8?B?WThPSGYwQ3JqK1liK1F4dnhHL0orYVV6QkdCcHVBV01vT29oN1R2ak9Bd1c4?= =?utf-8?B?THJzNHUxVmlOaExNa2pEUW44dlIzTi9kMjR0Q1hFRXB4TkJjWndxSW9mcllu?= =?utf-8?B?Qy8zckx4S2VnZmRyM1pPTHQ2czdpYTBzSmpINlZNLzM0MzFpUmdhZXd5cWl4?= =?utf-8?B?cEdmRXpxOU9qMlVDKzR0dFpXUDNrNURZVGJ5VjYxbGduN1dIZ2N4ci9NaXNy?= =?utf-8?B?VytLc2lxVnNLTE9KWkN1TTZMdjlaQWZuOWw1eEhJYzNHS0ZFbXl1cXkwdEQx?= =?utf-8?B?VkVTV082MTVsQTJJdmJ6OGx3bTNYNFAxRUFPMTk5d2J0WWw3bHc0MUY2R1Y0?= =?utf-8?B?N045K0FsMENWVU5rMTZMWjMwUlpoOW1uVGtIUUVid1ZzVjFmNUpYY1piZitq?= =?utf-8?B?TGR4SncwRjg3cDFXUDY4Tm5aVWk3bklXOUZoRFBFZG1veVhKeGVCVU1wdVpJ?= =?utf-8?B?TFN2ajh6NUcwNTJkdmxnM05Tc2xneXJZSjdGdFVwclRqcXdNVHY1aXVUUWZl?= =?utf-8?B?U3F4bGpKZVpuMmlHRldhei9DSVE0ejNDOU5uWlk5ejIxbWsvQWRRdEVKd01M?= =?utf-8?B?a0I3YWZsellYR1hEeHdpUytvaWFrU0doZFJCSVI3TnlsaEJlKzk1MnZKUmZt?= =?utf-8?B?WkpNWHdXR0YxSnA2K0k4VU8zYm5XS2pNTkpGeC9pRkdBL1lXVDBib1N5WGlq?= =?utf-8?B?cGp6NzRJVFN6cVBUYUtKQ2J6OGpCMHJjd1FTQ2JXTEhKclFsWk1odlFpeXBP?= =?utf-8?B?N3kzNkZuUGRIM1pxS2JxSFc3ZXJ0OWhlNm9Dc2NYOHUxRmNtRHhMUEFObXNu?= =?utf-8?B?cGt6R0MvbTJPcW9xTnVMM1hjdjRQU3ArNWN1RGRUUUlnUVBUYktmUEJBRVUx?= =?utf-8?B?eWUwazQrYjdSV0ZpWjEyZDc2OHRWZytadGxhZ3VsSE83NHJQYklzWENpcldF?= =?utf-8?B?ZnVuUGJQcnhtRjZneHlGTXBhMjhGUkYyTnlSSGsxMm4rVURIeWtCYjlnYW9C?= =?utf-8?B?SGNXUkZLT21HWEpDMktmUUkzZ0RyaEZNQ0oyeE83WUp0L1R3UzZaaHNUU3dJ?= =?utf-8?B?d09NOC93OUhqTE5OREFFRXFLcTNLcW9POVIxKzJVV1pvR083bGRVcmdrQzd3?= =?utf-8?B?WExlV3l0MHpWWmRhMXVSemUrWk5xQldON2NmREhKSENBazNvWFl2RFlPc3R5?= =?utf-8?B?QVlsMWw1eCt1VjNFZllNd0pSL01BNWFHTkdQZVF2cVN2ZDFOaWcyWC8rUjBR?= =?utf-8?B?UE8xbFMrOUlpQTc5WnNCWjk1TUFpUkpDbHd0SVNzNkwwZmpad2I4K004TlRk?= =?utf-8?B?Q2JYU1ZTWThHVDJ1SVI0QW56N0llN2VMQmg0aUdZbVlNUENIQ1AyR3NzNTEv?= =?utf-8?B?ckI0ek45NU9JL1lUMWRHMm5QQ29wYWthZ2d5ektPRXI4c1FwemJzMENEWUgx?= =?utf-8?B?Q09yNU91MGFWbjRqOFFaSUtyMUxVNU9OOVRBa1NldDN6eklvVXZHRW8xbXN1?= =?utf-8?B?WHNFcHl6YS9Bd2dDVWIzQkZlRy8vQm5kZG1qMUgzN0VzNEJPb3JwbGNNcFUw?= =?utf-8?B?SzUvajJkRWdncUl1a29ScXlvTXR3S1VUSU5YVk91VnY2Rll1Si9PNEdkUzdT?= =?utf-8?B?Qk5DRWNFU2dxcUtvU0RUTUwwMWtXNjVPN2IyU3Y4VmZRRkk3V3Q0d1FwRTRB?= =?utf-8?B?cEVlSThGUWtOeVlBSHJLRG5qUVZhMitVSTloT3VOaGVYbjJzZ1h1NjZsZHFM?= =?utf-8?B?aWdjTUt2RmZnU0E0aVhHdlZpMEJvRmhQOGEzT1ROdEhsT3d1OEQxNncvME14?= =?utf-8?B?Nm5jcFFyUURkV3Y2MWdJN3NWZnk0OXlsODV5YTd0YXVaN29Kd3VNenRtNC90?= =?utf-8?B?Tmx4Y0ZzVHl3L1ZYS1MwZ0xrdWxVc1FVbmgyOHNUV3Q5THBwckVjOEF6QjF3?= =?utf-8?B?eW9QZHNEUnVkNkhSVGw2TlRGTmJsbkYrNFgzdzVjTDZjWFV5RHNYVVhmVzlw?= =?utf-8?Q?vb5o+I7oebDJ5t1GzovQDdg=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08469d6d-8fe3-492f-4e15-08d9c1b3d42f X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 23:20:35.4051 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nJGXYQyMepRkEgp/bbI8RM8BATitZ5uYa5Ojl7NCLGywpysEtdsw5DI94LbBfj/2DsyrnSf30weKbCssuB3n4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR03MB7275 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Hi Matthias, On 12/16/21 5:26 AM, Matthias Schiffer wrote: > Having U-Boot look up the passed partition name even though an alias > exists is unexpected, leading to warning messages (when the alias name > doesn't exist as a real partition name) or the use of the wrong > partition. > > Change part_get_info_by_name_or_alias() to consider real partitions > names only if no alias of the same name exists, allowing to use aliases > to override the configuration for existing partition names. Much saner IMO. I think the correct move in the long term is to add a "quiet" parameter to do_get_part_info (and all its helpers). This is OK as an incremental improvement. > Also change one use of strcpy() to strlcpy(). > > Signed-off-by: Matthias Schiffer > --- > drivers/fastboot/fb_mmc.c | 29 ++++++++++++----------------- > 1 file changed, 12 insertions(+), 17 deletions(-) > > diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c > index 2738dc836e..fb7791d9da 100644 > --- a/drivers/fastboot/fb_mmc.c > +++ b/drivers/fastboot/fb_mmc.c > @@ -104,23 +104,18 @@ static int part_get_info_by_name_or_alias(struct blk_desc **dev_desc, > const char *name, > struct disk_partition *info) > { > - int ret; > - > - ret = do_get_part_info(dev_desc, name, info); > - if (ret < 0) { > - /* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */ > - char env_alias_name[25 + PART_NAME_LEN + 1]; > - char *aliased_part_name; > - > - /* check for alias */ > - strcpy(env_alias_name, "fastboot_partition_alias_"); > - strlcat(env_alias_name, name, sizeof(env_alias_name)); > - aliased_part_name = env_get(env_alias_name); > - if (aliased_part_name != NULL) > - ret = do_get_part_info(dev_desc, aliased_part_name, > - info); > - } > - return ret; > + /* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */ > + char env_alias_name[25 + PART_NAME_LEN + 1]; > + char *aliased_part_name; > + > + /* check for alias */ > + strlcpy(env_alias_name, "fastboot_partition_alias_", sizeof(env_alias_name)); > + strlcat(env_alias_name, name, sizeof(env_alias_name)); > + aliased_part_name = env_get(env_alias_name); > + if (aliased_part_name) > + name = aliased_part_name; > + > + return do_get_part_info(dev_desc, name, info); > } > > /** > Reviewed-by: Sean Anderson --Sean