From patchwork Sat Nov 4 20:37:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1859311 X-Patchwork-Delegate: dario.binacchi@amarulasolutions.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=NC93Ya0M; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SN8Zy2ByVz1yQs for ; Sun, 5 Nov 2023 07:38:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D6B50871A1; Sat, 4 Nov 2023 21:38:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="NC93Ya0M"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C151C87083; Sat, 4 Nov 2023 21:38:08 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) (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 2D2D486F65 for ; Sat, 4 Nov 2023 21:37:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-66cfc96f475so19731426d6.3 for ; Sat, 04 Nov 2023 13:37:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699130277; x=1699735077; 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=RRbwhPzKqs+wgHGjH3YtUMbtwBdJmErU+sUpNWJ+7Hk=; b=NC93Ya0M3rFYJkM66ygHn1xLW2TD9ZXDxG1jNUXyR3FsziRrnm38HH5Zy0hUaUwZAx FH3hphqORwl3CN6eqDfOdjEJ7R4C4JZQd7edkk3a/Wr71HKALbvwJA/PznXwr7P7xXI8 Js6XBuUAA/+0C0tly2nUbvUXDAqCWQVeUOx3Gh/m0BNIE2A6N4VHZXCydrZ2Q4sQrCwX HklvvZ3NAj8z185B0z0xErdPWm3vxLRQbxBbajpLwqliFf56NyIv0L8OOte3j59LfEcy KTROWHjsz47RanrC1SvGphtShzXH0IWSF/B9thk1yUNj8YbE/BqYbXZ4TugZjTu5G8X8 NdVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699130277; x=1699735077; 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=RRbwhPzKqs+wgHGjH3YtUMbtwBdJmErU+sUpNWJ+7Hk=; b=U8kDR99ssRjCKYWK1MlBb8Lk6cUkgkwwFCkPI2SKcAVm8qROc7Uras7/xLWFvtq2TW MQiaYVS6gaL9yuwc8/EFEz+ti12p/OVeNmIFdQa/BYKOIKBluQZF3H8ZNxyP7hW0SgvP VdN07B5QtFpl8GVzAEzTtkpNnUh1nnGffimm2r2fhIQrjaNDc7DKaCFJWuqOuAnsMOn+ UGMguVlWsDQVkiU6awTW4tJnQxBOn4+d9QQn4jzhHKUhljsQO+f/VULN3pFsZvidCv7v O12Kkh7MCKAUIeAUtUuJin6Pdvhc+7hAVAopSj+YvDD9hPJOSgkeaPGwnspmWX+paN0/ YoxA== X-Gm-Message-State: AOJu0YxeLsX5OslIFYsOoEyT1OLGC8+eHTC9zyX7pyz73GDkXj7QY1nX ZBcyv7gZ32IaOhhwyioG3Y05furVxAPRNA== X-Google-Smtp-Source: AGHT+IFA9+T8tYuPJmXun9o/Xvs0bLHpcgOBM3xDtk7uwzsqnlmb5nRxRE6VsuAuzmAz9URTFEHrYQ== X-Received: by 2002:a05:6214:3009:b0:66d:65ae:18f6 with SMTP id ke9-20020a056214300900b0066d65ae18f6mr28645335qvb.50.1699130277260; Sat, 04 Nov 2023 13:37:57 -0700 (PDT) Received: from localhost (pool-108-48-157-169.washdc.fios.verizon.net. [108.48.157.169]) by smtp.gmail.com with UTF8SMTPSA id d9-20020a0cf0c9000000b0066d1348bdddsm1934057qvl.44.2023.11.04.13.37.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Nov 2023 13:37:56 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de, Dario Binacchi , Michael Trimarchi Cc: Tom Rini , Sean Anderson , Peng Fan Subject: [PATCH v2 01/15] spl: nand: Fix NULL-pointer dereference Date: Sat, 4 Nov 2023 16:37:39 -0400 Message-Id: <20231104203753.1579217-2-seanga2@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20231104203753.1579217-1-seanga2@gmail.com> References: <20231104203753.1579217-1-seanga2@gmail.com> 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 spl_nand_fit_read unconditionally accesses load->priv. Ensure it is set. Fixes: 00e180cc513 ("spl: nand: support loading i.MX container format file") Signed-off-by: Sean Anderson --- Changes in v2: - Don't set load->priv for spl_nand_legacy_read since it doesn't use it. common/spl/spl_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 07916bedbb9..5b6932bf7e0 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -105,7 +105,7 @@ static int spl_nand_load_element(struct spl_image_info *spl_image, struct spl_load_info load; load.dev = NULL; - load.priv = NULL; + load.priv = &offset; load.filename = NULL; load.bl_len = bl_len; load.read = spl_nand_fit_read;