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 A5F4DC433EF for ; Thu, 27 Jan 2022 16:22:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 17B3883108; Thu, 27 Jan 2022 17:22:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject 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 (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="VKov+x6e"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E19D583542; Thu, 27 Jan 2022 17:22:23 +0100 (CET) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on0608.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::608]) (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 B3CE880202 for ; Thu, 27 Jan 2022 17:22:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject 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=kA5grR8lmWaWM6YJKs+zyuDRviUJIvCVM5GGuQ+A8mKmnm8AUGXHUDDgL2DmrJB14MUYMFcfiwE49drzT/dEjs6DbxtAIKq7g6kS3T2B/Hb9GnyLbJjW1NL80MHDubb+Lq879Qi+o7bC1JDdgffJtuTNTdPS51uYMWs+0OMILqhtMDlCWaVE0ghyrrQDdogNTyq1BhRu/sfTh5dBLAU7vu/4ORN0kVHw315/GhawKDQVr/sbOMDfoZdPX8Mf8e49T/P3RgwBH3luUusPzVRsyy7L+cSUzJ71PZJUb1hIcD60MkFg89WREjQ+fQfzaRsHJGd1Gc84aoF40dw4F5krVA== 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=PMce/7Kv+qDlXJnFg0XqeMcJSPFxCu2X6+GFeozWCgg=; b=P7gLp2FWx9PwAgdQUM8m+YbIRDYxVdMWmDZolTtNGTUvhcRsn7GO/JWgDYv99rODvzUCIy5hdBcKxcPFVf8ctHfF08xFsD4yCcRhchPuyvceVuSGwVylyIIF5PfLGvJ5qi2FPm9cFaw/+WsTNzTiwcZdLdGPuNr3MsjByHTV/9uP8UsuEQpH/nPCo4hIel4YFM6Chzx/qIbLXgh06H69BhrPJNt5iZxmoGcD0tLeNdzChco/fMKmznIn2g+AtTkHw9Q9BfvXIc51lO1vP4Qz6PVYMeVO6rtxYMx78sVQwe6hgogsQcdT9vfRSeZpanw0k9WonOht9gs2hH+9Fd6oZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PMce/7Kv+qDlXJnFg0XqeMcJSPFxCu2X6+GFeozWCgg=; b=VKov+x6eXJCYD4nGhfnfVu1fDyROia+1gVrxeS4mdW1iYdpMkClRTsIjXMYV4PNcT06nUqfjkTUEhcM62WgFUIHLzInJhTIC5Tqd6UQQWpolLSQ1GxX32AhLuhVZHxNLaqj0xCfZsJjI+jAVekS9jZfPjJv21xBYeFrHzJodIARCleyLkWNHB5HEi93gbRO3shttcAuFMY47l3eFIlmwdCjCGWNPupT6mWLQaSgqYAh/yS66szwsagnmvS9bgQ9nwAFlWOTGKAYtJa72jSY+zZyTe9EAXHF1SN5+tBtQ9xPOpfvSwWYEwPVah1gbCxqLwm2O/cTwQqM2ztWTphrSHg== 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 VE1PR03MB6127.eurprd03.prod.outlook.com (2603:10a6:803:105::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Thu, 27 Jan 2022 16:22:17 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::2d1f:654e:f946:1a95]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::2d1f:654e:f946:1a95%6]) with mapi id 15.20.4930.015; Thu, 27 Jan 2022 16:22:17 +0000 Subject: Re: [PATCH] fastboot: only look up real partition names when no alias exists To: Matthias Schiffer , u-boot@lists.denx.de, Tom Rini References: <20211216102638.111391-1-matthias.schiffer@ew.tq-group.com> <5759d408-e876-9444-d14a-22bb37aecc14@seco.com> <7df14f127c28ecf6f3cc389820066fb898a630ac.camel@ew.tq-group.com> From: Sean Anderson Message-ID: Date: Thu, 27 Jan 2022 11:22:12 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 In-Reply-To: <7df14f127c28ecf6f3cc389820066fb898a630ac.camel@ew.tq-group.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: BL0PR05CA0016.namprd05.prod.outlook.com (2603:10b6:208:91::26) 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: 06f59940-418c-40c9-a99a-08d9e1b12f6b X-MS-TrafficTypeDiagnostic: VE1PR03MB6127:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qUlHYRSE050043BcKUUP8CPzn+mj+SSheNpuLK6MVvQavTs6awCtvEVUuX1nlURRs1e4K/TmQ6NJOxIqKeEvS9ry9gXRujdU7SeHn+0NjugSQbub+EpxYwoDbYct/TmkKUKn0Z/+8A/pQpwzSP+YIsbZeWPB1q5gKE3VSMVcle7ccZ5dtLWK8FcsYRsWue+vWQs+YkJpMQ/fzk6/s0rzrXpmV7rTNQ9d8iFh9UP48FqNlRGukkJ4FeBOkmAGQjPUyL5GoQlowdMyg/9u5kfp6ZEc9kFQbJQ9gac78OWJ1VaGBfhZgtaXzPu+zeKRkR7BXZ1uWXIxJ5IZPCqtUt4wS+TSzn4/5dymb1pwMWq/ing0NkUaWUupznKVsvOfniYLQ1/EfpIVOsc/LfRbaefH+gVNXN8VanzlCcfdZUXs/REhbfo3xmd/DQkCNDrKAysnyHnJgmzapwEgFKK6qjzT/oHZHrXG7jBRrioZ1q3oum3vghYKBatjswVw6Cz56JlPCb9bRiTYpMP196xzJbugcvOXneN6ucIQu5JrK5N3Hrco8+sQhJIA26IJ8DWVCvgHqe8g1qDec3gDsXCJxdDpokTCNGYjIJ7/Vz9DtR38/NuE+UKLRKKVY5uHfvBKxznvB8I6PFJqWmIfR5RcvbQWmrwt/eH8pS8Gp4JCHt4HLU4P+wQj7FTzSm/rl4EW9qgGOwOtH7XiActEcSq+tEqYj6+Pyw4HsMISn2dsihwcY/MT97vK9oIMRGoicLErsr2VrFyijNacMmnrvxhHcwABlg== 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:(13230001)(366004)(36756003)(6486002)(38350700002)(86362001)(31686004)(2616005)(26005)(186003)(38100700002)(110136005)(6666004)(6512007)(316002)(31696002)(4001150100001)(508600001)(44832011)(8676002)(5660300002)(66476007)(66556008)(66946007)(8936002)(2906002)(6506007)(83380400001)(52116002)(53546011)(43740500002)(45980500001)(20210929001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TDBHLzNqSFhUZTdsYUZ2WURSRTBnZmxNNzc0cVVpTHg2aFhzVUUyYXVlVzZU?= =?utf-8?B?VUhkcnpiTFY3MTlpWXRYOVJUVTRlSUFsQnlCNkpHOU1FM1NpT0QrYmVaUU81?= =?utf-8?B?bDV6RTBqdjh3aEIzWkVnZDI5cXUxdkMzNlE2Z0ZEZy9JVUFHVS9UNXpuRStO?= =?utf-8?B?N3JPQXg2dlF4WnBEeTFxV25mNkE2WSsxWGtpSE5XUmcrVDVRcUltS0pMc0hk?= =?utf-8?B?WjNMY3FMWXMvck5iaTRhNDF0dUQvTHN1WjFraXFwYVcxSXRNTnZlaWtUUWlp?= =?utf-8?B?Qmd6VlZndWdUcUxhUEdIV2g2ZGU2MkEwd2RJMWFFRzdERThiM3BZbmpmRHkw?= =?utf-8?B?QXVoZnA5cUZVcm5hVktrRmN5Tk4zNHFJczk1VGZWSUppZnp4QTJFd3VSWlM0?= =?utf-8?B?elV0cStUL1o5QS9ueFpDTmRPeDY3MEhBNXFaU0x2cDdxbldjSHA1emFiR3JJ?= =?utf-8?B?MVlGdXI1dHJkNkdKUG5NMUd3WVAwUlhmSUk4M0ozQ3d1QVNablpzVkNCd3JF?= =?utf-8?B?K0NzR3RmaVVBY0YvaDhaYXBzZkFyc2o1OTE1clpJeVA2V3VieGRuN0pnQ1Qr?= =?utf-8?B?OWxacm94bGRlbllNMC9TWEIraFlUbk40VGRBSWlkZW9hdE9BZUZnd3ZCVmdV?= =?utf-8?B?Q1VnMExQWUxKOC9OdW9qN2VRd3lqU2ZKd1FoSzkwNUxXcVNsRkdSRWlyTGZp?= =?utf-8?B?bkkrQmpUOCsxeFk3VDRxNHhaQURtT1JNR1pxRkR3b21kbEZOanlEZ2N6dll6?= =?utf-8?B?cWk2SlhtNDkrZEVtWHV1VHIyUitJQnFoaGcrNzBPa3pXaDBwN25yR2FqVGVx?= =?utf-8?B?eVVtMEVoUzZwYjlrcG9TZ2E3OFFWR0JBS3dPUkdPSWxRUVZZTlIwaXhFbFFE?= =?utf-8?B?RFJ2QUw5UEduTWRkZWk1Mm9CdXNUMkpxMVBvVzMxLy9jdlZRR1dBS3RlczRt?= =?utf-8?B?VXdZNHc5M0tvZ24zZHpqOXFHRWRJY2N4YlhqcXRpalpCbENFODhGNE94Y2lR?= =?utf-8?B?UXVVU1NuRHFuUVZDTHIzVVpBZCtpOWpzMFJnNG0xWkdkZXhORVVlZ0l3NTgr?= =?utf-8?B?QW1HUXI1dHh1Q2ovRDVXeDJmUzU1eUw1a3JPd3IrYmJHNDNvV1JDM2dld2Fp?= =?utf-8?B?SklBQ1lZbzh0QUkzZStTQlA2bTF5UkF6RmU0Yks5aG9ZYTg1ZDB3OFJZeXhE?= =?utf-8?B?eHdFRGZPNjNCS2xUdHhuZEVuODdYYVlOTEV0dUlxeXdzQnNVTHJyaWJLd1lQ?= =?utf-8?B?dmNvV0tNOXBidUVIcktFWU9BSmlHaXAxbklGU0RtZXdhZGRoek5yRkI0bjM3?= =?utf-8?B?S1EvVitZMlc2UWQ3VWJXd25abmVDY2VPSDY0SkN6UGR2d3lkbGFvSjd3RDlQ?= =?utf-8?B?ejNCVDVFcDdiUHVYN1NHOUlNNXN1bjFHNU42MzJXaGpyWXNVUW04cExzdENF?= =?utf-8?B?dGFTcTAxQTJKWHV0Z3J0SEJtRENVYkNkY0lVZkxDMGNlNW5pcjNIeWJUNkYz?= =?utf-8?B?aDB2Wm1UL3hOK2x0NVE3cjg3QTRaclNLOEtqQm82UCswUTZqdzNPeW1LRVpK?= =?utf-8?B?WG9KeGFHcGVDUW4zd3JWTGVuaFBVekZwZXFqcnRaTUM2WW05S0VtVFZpa2o0?= =?utf-8?B?V25OSUNGdjhTVERMWjdMUDBkb2lvMlJDUTlVL1NURnFwbnF5VDhycDd5OE5K?= =?utf-8?B?RlorZTN4dXp1VWhsbHZLa05tREQrQVFSLzhuV1pvWWdLTm94bzRHb2hWUEp3?= =?utf-8?B?eXFjaGc4OHBoaVBaRVdzQWNxWGJiYkh6N0pJSHFhM3dXcjBOVE9xTzFwN3V6?= =?utf-8?B?MGN2L3c2MWZXdkthR00wKzNoZDQwMzFrQWJLNUs4Nzl0ajF5MUdGOHdYN1Jj?= =?utf-8?B?dzVlRGNJRkxsSTJsVE1yc0lNWmVyODNyTTVDSlovTWJnWFlYTzYzTUVwRkJj?= =?utf-8?B?SHNTc2JQOGFPZ29OQi94cytsb2pyS0c0NzBQYStWcE9oVDl0Z0REd05zQjlQ?= =?utf-8?B?OFd2M3B6SFhTeWVZblF1ekFqLzB3OEg2SEdoVG4zWXR3MHNEY2xsMDFDc2h2?= =?utf-8?B?SkZKa0RudS9UN0FLd0NwTjRnRDBsY25OY2pOa29zMFVIcWUxSWNsUlkwNEdt?= =?utf-8?B?ZFRWeG1IazZ0cnloNk1RNHpIUElJSmsyd2NCbDZWek9zR0VDbHpCYlVhckV4?= =?utf-8?Q?sYBVUsFT6+PmrYfYV/oVXQ4=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06f59940-418c-40c9-a99a-08d9e1b12f6b X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 16:22:17.5525 (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: AZ5m4PnalvzIejHxtjrsA50znTkxE7MBKJbF9lElceXDgKPyCBp0J3wJDCG8GR8TMZHLnYQ+5n5Y0LLyu8V+Sw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR03MB6127 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean On 1/26/22 4:54 AM, Matthias Schiffer wrote: > On Fri, 2021-12-17 at 18:20 -0500, Sean Anderson wrote: >> 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 > > > Can we get this committed? +CC Tom