From patchwork Fri Jul 30 12:23:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 1511635 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tq-group.com header.i=@tq-group.com header.a=rsa-sha256 header.s=key1 header.b=cu36Lt8i; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.a=rsa-sha256 header.s=key1 header.b=cu36Lt8i; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GbmmN2lS0z9shx for ; Fri, 30 Jul 2021 22:24:17 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 87BA982F3F; Fri, 30 Jul 2021 14:24:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ew.tq-group.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=tq-group.com header.i=@tq-group.com header.b="cu36Lt8i"; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b="cu36Lt8i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B086B83116; Fri, 30 Jul 2021 14:24:06 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) (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 939B282E05 for ; Fri, 30 Jul 2021 14:24:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=matthias.schiffer@ew.tq-group.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1627647843; x=1659183843; h=from:to:cc:subject:date:message-id; bh=f86sHoag5CIoCrQGyKY4aUFlQC59kuvJpexf7u9wRIU=; b=cu36Lt8iK7MWrxNkdzuWYOf0+MsEAQU4LsoAuNU1+60VoYqG+WGuHKYA KT+pM9V2gcDKTTKqbB+YyaY5yHrgNUFnkSzbXhdHURt8NIJLPqtLIXUnu bdiFNEmgpljwafOurkER3PGrwCrKgwXU78WuUH4T1ajzGtcbtESVDW/eI vsYeSFqYMG3Atzm40QuKvAOlRltpfNObHQInEagEVvLlBmN55/exf4Onc BXrFg7N52CZMKPpmsg7Vh5sYYa0TZLR5ORaKOF24/rRUbMM6qkx/41edC KLWOLH2Cm92dPD1Ny2IdXcKZ3jaV31YEJYDKnqRKcWueJGBr1M8BMvf3Z g==; X-IronPort-AV: E=Sophos;i="5.84,281,1620684000"; d="scan'208";a="18738064" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 30 Jul 2021 14:24:03 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Fri, 30 Jul 2021 14:24:03 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Fri, 30 Jul 2021 14:24:03 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1627647843; x=1659183843; h=from:to:cc:subject:date:message-id; bh=f86sHoag5CIoCrQGyKY4aUFlQC59kuvJpexf7u9wRIU=; b=cu36Lt8iK7MWrxNkdzuWYOf0+MsEAQU4LsoAuNU1+60VoYqG+WGuHKYA KT+pM9V2gcDKTTKqbB+YyaY5yHrgNUFnkSzbXhdHURt8NIJLPqtLIXUnu bdiFNEmgpljwafOurkER3PGrwCrKgwXU78WuUH4T1ajzGtcbtESVDW/eI vsYeSFqYMG3Atzm40QuKvAOlRltpfNObHQInEagEVvLlBmN55/exf4Onc BXrFg7N52CZMKPpmsg7Vh5sYYa0TZLR5ORaKOF24/rRUbMM6qkx/41edC KLWOLH2Cm92dPD1Ny2IdXcKZ3jaV31YEJYDKnqRKcWueJGBr1M8BMvf3Z g==; X-IronPort-AV: E=Sophos;i="5.84,281,1620684000"; d="scan'208";a="18738063" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 30 Jul 2021 14:24:03 +0200 Received: from schifferm-ubuntu4.tq-net.de (schifferm-ubuntu4.tq-net.de [10.121.48.12]) by vtuxmail01.tq-net.de (Postfix) with ESMTPA id 06CE8280070; Fri, 30 Jul 2021 14:24:03 +0200 (CEST) From: Matthias Schiffer To: u-boot@lists.denx.de Cc: Sean Anderson , Matthias Schiffer Subject: [PATCH] fastboot: fix partition name truncation in environment lookup Date: Fri, 30 Jul 2021 14:23:54 +0200 Message-Id: <20210730122354.6281-1-matthias.schiffer@ew.tq-group.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 strlcat() need to be passed the full buffer length. The incorrect call caused truncation of partition names for fastboot_raw_partition_... and fastboot_partition_alias_... env lookup to much less than PART_NAME_LEN. Fixes: 69a752983171 ("fastboot: Fix possible buffer overrun") Signed-off-by: Matthias Schiffer Reviewed-by: Sean Anderson --- drivers/fastboot/fb_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 2f3837e559..33fd6c21af 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -40,7 +40,7 @@ static int raw_part_get_info_by_name(struct blk_desc *dev_desc, /* check for raw partition descriptor */ strcpy(env_desc_name, "fastboot_raw_partition_"); - strlcat(env_desc_name, name, PART_NAME_LEN); + strlcat(env_desc_name, name, sizeof(env_desc_name)); raw_part_desc = strdup(env_get(env_desc_name)); if (raw_part_desc == NULL) return -ENODEV; @@ -114,7 +114,7 @@ static int part_get_info_by_name_or_alias(struct blk_desc **dev_desc, /* check for alias */ strcpy(env_alias_name, "fastboot_partition_alias_"); - strlcat(env_alias_name, name, PART_NAME_LEN); + 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,