From patchwork Sun Jan 12 03:42:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 856751 Delivered-To: patch@linaro.org Received: by 2002:a5d:525c:0:b0:385:e875:8a9e with SMTP id k28csp888622wrc; Sat, 11 Jan 2025 19:42:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW+VQVoAprEklACSRAIiDTl0lOIYHC0J7dAzzQHZ5CkPyEehegaiKdKiZtXegsJWju6l0l9pg==@linaro.org X-Google-Smtp-Source: AGHT+IHxwMDMekPj5knd8SNpWRzIc/YMviJp1337cHJ9GDAJGZ1p9eb046Do4YXwKmgQc+xaEXAF X-Received: by 2002:a05:6402:5109:b0:5d0:cfad:f71 with SMTP id 4fb4d7f45d1cf-5d972e7110amr34585001a12.32.1736653350516; Sat, 11 Jan 2025 19:42:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736653350; cv=none; d=google.com; s=arc-20240605; b=IwuJPg1/1qr6bYEva4jTPf47BCMxVHjplf3I2MAd9FtdMFYJxx28lPpSN3UKxwX14O sfsKK3gwEDfpDNUEyMIewtGW7lkvFEhPyqglt3xaIXKknvlGfZS8JZTRVXUj/TjQbNM6 PszyAvXUoHBwQSQlxKkx/o5nnb7/BR3RHhWrqDOuFvY54UKewaey9EQEUiuyFt+P6nQW fLwXkUmDZ7rQrAlv/kwuDVlTi0dlXIdXJ2H/Dw8TqWN7K5xzPIoIvPnJ3Gx8yFKwOJSn TQPIcTpe1F3nKy3sCHozPEjApMbdM3PN7UMhrsQtkU+k9prtL+gl38SCKHpfNWhK8Xrd Iojg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8GqWMM7WOX8rE18EQNu5ubLw9ojN7anB4FsnTFrS9L8=; fh=vtNonh0NiHxYepiXbrigFY/LCQLAmEiW7N1qKnEE3F4=; b=UKzSB1Rfpqg5ZO6zAB8Y8xKU1k7WwntHoSagBhjF/6PMe2Thww3P8nVVbFbLvkktpA 3oGG1od5jv5iu8OEA2JGBxjWzUnoiY2NxFORQjqaAV29OEHXRhu5KFPChicEdKTi9yQm vIgO8DL1NHDAoMqXBDqCKObc8qLQBV+AjvXR0Uo6XebLWnpQBhKHYwop1F8JXHOLbnCs bWHt4X97ZhWeJg3l/VIgP/Afl8bZJClDoY/7e8W/VKSk5sZHtsod+aPsBWsXa0zI6pzj GkDg1LAPo16J1VsyDxXerMNWjEQ2YW49/uOF1CDkFDu1jTWgyHG4S9chpxmHmQg+36U+ U72w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nfEoPwoq; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-5d99f0524c5si3618077a12.512.2025.01.11.19.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jan 2025 19:42:30 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nfEoPwoq; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 77C66805E9; Sun, 12 Jan 2025 04:42:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="nfEoPwoq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22210801F5; Sun, 12 Jan 2025 04:42:19 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E6658801F5 for ; Sun, 12 Jan 2025 04:42:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=semen.protsenko@linaro.org Received: by mail-ot1-x333.google.com with SMTP id 46e09a7af769-71e2bb84fe3so1768596a34.1 for ; Sat, 11 Jan 2025 19:42:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736653335; x=1737258135; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8GqWMM7WOX8rE18EQNu5ubLw9ojN7anB4FsnTFrS9L8=; b=nfEoPwoqSVeIKRnL+Vlg2jb3cSreZPFQG5OSlMMyBUnJfjpuM3YXgoqf0DSsp7gNMZ 0p8ulNqXhnPeXGx7vG5uHLzt3+NuExAHaLgGC9jsHbGVTPPu5IuU/GVeWSS2MaQLXwMN iQldvREHix5mSGYsK1xTWBRct3geIyHWboqyVXO9jTQqgAWZM4Psc6r9lBaDeWwhHGqN B77ge0Qfts35a4oEMVcXI49vnoSFxeBfNbBASfv7VlLj5bXQX6nOiarZHhjFwt3BXOP1 CGKNEIszykJPbBOxuRej3mkMTURf4SAE//DaWkzgGMjpOhysCMdrAxK8A1HeEuZY/2/Q 25xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736653335; x=1737258135; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8GqWMM7WOX8rE18EQNu5ubLw9ojN7anB4FsnTFrS9L8=; b=hmw6EJticyardGeIxChE+FNXj9ni7I+AXxezA/iq+VdALLzkSOVmEAjswM7SV0U+gv 47oxx8esCMkehRMcyDLWet8gMKGvFoUzkbgdEW0lLXTrXbm8ZbEam5ceFcq0cReWthHK hQQrDbJ9juGq20ZdKeDoMs4iYJaIaCwGUNoNDyWdrX4wTYHI/qahgmFbz+O8/7thNIKz vSAaA2lc3/ILctzNbXRLkus+3XiWhkoC1e4QTGjTpveWJUx2/YZlvnRR235GBqv/FRyq oARmcxc3S/QxuWerhx3p92gj1mihy6TNN8G4CPZ/WEurlMBehjOxTTxYOWHNbW9TPHYp BQJw== X-Forwarded-Encrypted: i=1; AJvYcCUfrzdM9VXd3Kb7jXTbwKjyjYGnS0bc7NjxzyCbhcX0yKMrnWvm8dt2I/h2EzfkkDdQ4L91DME=@lists.denx.de X-Gm-Message-State: AOJu0YwpQjyOwiMT8HCnmK/tKBkMMCqsGcQeA4nh4IH9N8xQK0vCrJ7a +aJPGHPeznvWvbXsVceZM1TvK44x/uj4r+KIFKgk8655ZNjSAIKe3DTEayZKUPc= X-Gm-Gg: ASbGnct6eMkh6SUxR8SWMONeHUv9pgeFYCRoIGnA6js/WcZd90JZZ9ls0W22mSIUyjg /sa4MxCpd7LXnRsQF8b861H4GbGi52ABbgV2VWhOUOz0yDQZBX1eoH3oyUutUMMo5Cdu2l6AyBG CrB0bzLzKij0Au/kWXR+P57baQtppRxRI+vCq2IvzG3t/jI4UkslbcDKDgjh88C+oRfBwxGGw92 fn6gSoQGZO3fRwPM/KfwoFUs4TfBTbIKlaCP4P12yTXOIPgb14uKNBtHn/ZoC4tzmE= X-Received: by 2002:a05:6830:90b:b0:71d:ffa1:6b0a with SMTP id 46e09a7af769-721e2f00d87mr8782251a34.23.1736653335643; Sat, 11 Jan 2025 19:42:15 -0800 (PST) Received: from localhost ([2605:a601:a0f4:b000:264b:feff:fe59:d7f7]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7231861c020sm2313928a34.49.2025.01.11.19.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jan 2025 19:42:15 -0800 (PST) From: Sam Protsenko To: Simon Glass , Tom Rini Cc: Heinrich Schuchardt , Ilias Apalodimas , Martyn Welch , u-boot@lists.denx.de Subject: [PATCH 1/3] bootstd: Fix memleak on errors in bootmeth_setup_iter_order() Date: Sat, 11 Jan 2025 21:42:11 -0600 Message-Id: <20250112034213.13153-2-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250112034213.13153-1-semen.protsenko@linaro.org> References: <20250112034213.13153-1-semen.protsenko@linaro.org> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean Free memory allocated for 'order' (array of bootmeths) on error paths in bootmeth_setup_iter_order() function. Fixes: c627cfc14c08 ("bootstd: Allow scanning for global bootmeths separately") Fixes: 10d16faa436c ("bootstd: Detect empty bootmeth") Signed-off-by: Sam Protsenko --- boot/bootmeth-uclass.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c index 5b5fea39b3b3..ff36da78d5a1 100644 --- a/boot/bootmeth-uclass.c +++ b/boot/bootmeth-uclass.c @@ -133,8 +133,10 @@ int bootmeth_setup_iter_order(struct bootflow_iter *iter, bool include_global) * We don't support skipping global bootmeths. Instead, the user * should omit them from the ordering */ - if (!include_global) - return log_msg_ret("glob", -EPERM); + if (!include_global) { + ret = log_msg_ret("glob", -EPERM); + goto err_order; + } memcpy(order, std->bootmeth_order, count * sizeof(struct bootmeth *)); @@ -188,8 +190,10 @@ int bootmeth_setup_iter_order(struct bootflow_iter *iter, bool include_global) } count = upto; } - if (!count) - return log_msg_ret("count2", -ENOENT); + if (!count) { + ret = log_msg_ret("count2", -ENOENT); + goto err_order; + } if (IS_ENABLED(CONFIG_BOOTMETH_GLOBAL) && include_global && iter->first_glob_method != -1 && iter->first_glob_method != count) { @@ -200,6 +204,10 @@ int bootmeth_setup_iter_order(struct bootflow_iter *iter, bool include_global) iter->num_methods = count; return 0; + +err_order: + free(order); + return ret; } int bootmeth_set_order(const char *order_str)