From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 831A835975 for ; Sat, 27 Jun 2026 22:28:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782599325; cv=none; b=av3yY2uVQChkpVZ9d+NyisMFS827mu2DPy5pceZzSv4/aRMJm2ut/WWrqq33q/bWGD/mLmRGo3bCbdZGNn0dyUct2UPH5ggkpmjTvAnMFBt0Y6uKJnetU2OZuRYTr16Flv/c8wFZB9ZZVQWWht/xdY4dxFoKHSuHAcDM2kJP5WY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782599325; c=relaxed/simple; bh=+dU1PTgIGXs7KSvWNEc5y7j/wC8Tn5l6wqIrUbQU1oQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=BAV2vZ2C9irT9FkHZkhTe8tOz1s7VP+/jh9VUY7h9I+j/UlJwLP1q8QqZDAMG5dvvlLjY5UB+yV+amh7OmpJJw7pbWck8eEY56i1GcLdp01Xhwjg3DA523W0PvCMjIfbaiJJlqXeFWa88iRogGVUnzIW0vx1fY3KRUIchDoXEAo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=G6ggfvTp; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=k2iURCL2; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="G6ggfvTp"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="k2iURCL2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782599322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=1a/DgFcrrEHwkA8ET4o3flsjcsRtGN3BOYsiECe4Zmg=; b=G6ggfvTpFgJH71PdJZ6e6GRvPQRYfbVPCBeJiDhNHtYkNVU6zT8lz8CBozWyyFi8RD9dIR +RN95HVZwiVkgM6IdIkFEXffuOCtmtz+jtEbIUMOVIj37RcR43S6rz/AiupVdjRzOJpj+0 ksLYtB8C6yRR7SX9P6WV9AEKGavUXFw= Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-221-8p4UbVSyPUmIVwdkgKzvFg-1; Sat, 27 Jun 2026 18:28:40 -0400 X-MC-Unique: 8p4UbVSyPUmIVwdkgKzvFg-1 X-Mimecast-MFC-AGG-ID: 8p4UbVSyPUmIVwdkgKzvFg_1782599319 Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2c7ef28ce24so15920035ad.1 for ; Sat, 27 Jun 2026 15:28:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1782599319; x=1783204119; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1a/DgFcrrEHwkA8ET4o3flsjcsRtGN3BOYsiECe4Zmg=; b=k2iURCL2GjLrjxbBP8iVez+axsUIILPM1MiH6BdVvmBqzt8EEet3PgJjTBnO0JHy6r LA1HdGX8pLvh2q5IRVwGnQnj0Z2c7HoAhR7oshPe7X6mABkKaSDSzJlhL/iD+M9pq8Wb NxbQ6Ip5okpBW4XC9uPcqVZ8VvsYpXHMpTFBZGRd509fGZk+rw/Rli1kuHi4gPm27T3W tnkygVLs9A7llGRzPsk1u4BwC6FJlPkYzR/5g6QoSoOYdPSUGVyjAz3QT9d7CbacxXgc Lo+wyc4md0ReQWTWADB9//SfYMsw3oncDfq1Rg2c8Vcks8t33PlYGFpxCSRv3GFL7X/G qW3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782599319; x=1783204119; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1a/DgFcrrEHwkA8ET4o3flsjcsRtGN3BOYsiECe4Zmg=; b=XrCTKf6nZ32ZICytIp7t3yJDzVqVNEvL3Icvc5O57fu3CY3am+F25Y4X+7UzzG7bA6 bPHQnf0QuIVuuGBISzqQtRvFLj/DoFoeQSXFGLHsDFCjQm8bWy+NX2c9zkdN/S5kM3JJ 3V7agZKbDT+OVvnAoWutzGMN/wPoEbewD+Ze5LWhBDEPu/ZontpBX6Vt1uHzyz4ZpEaI sY+dLI6Ks71AoeQRdxunztEitDU0sHDVEYzcjJI4s2PS084r12cF8I3MjudxxsQ6yXIq wjEetCxCSnP2SnJ0qgPM9NG6ouyHeZY0wBV11wBlEtj/qf65syRfPt2kXbKc+7GmMzLO IsNg== X-Forwarded-Encrypted: i=1; AHgh+Rrd7+ToFBYJSxauqaRve7J/tLbfMLenKY5x88JKkA9kmJdUu0Amuy6aJxcAID2pYvguI8QMmT+vtlEiOKM=@vger.kernel.org X-Gm-Message-State: AOJu0YzTTTQA+ZjzLfWhG0N8bnzWEdEPCUWDVC2L+JrEDFHZvTwUQvuS 6k38yl+21Ud9lHi+d2D/vzdmgtfmTWiKIbNS2aVRXuuVaVixVvKpPnXQ1qt91soymyjdI96CsRf A4VHfEutV/7MdSUn+q0y2qca2u60RFFZJ8YOYTWlon82BMAH8LkaezduJAzZ+5pR3sQ== X-Gm-Gg: AfdE7ckQiJ5ZiuDj/JktVpV1w7EN/pyy0g8HvWuxfpvylS6Dh0IaVbnxjQYoDUQ2Ewn oXekU4VPsJ9vHhldcTvWtGHW5SkrgiXcJNkW5jdqVqRdJI4N4OGO9/ieiKhvydddAImty/bKNVf rSHLbsoorppUMTxFqQsZZ074CDcT5eq2FyKAOLf0ASzEuWKJVaQZRe7FtfXWcE7PgnrAmzSOA8y IthlS+JOcvl/U9cARAgl5NaKD1dZtBFr2rNEhLT/PFHZCmVL1C/J0f+XvVLOAXNON3slAmOt3Wy lC/r9EoRZGOY1W/m4CCTZOH2X5o1zxBaWgoHM6tuuG+9tY+1UheJI9JHPuh/q5lSWHucRtFaQzY XL4MQE3mYk9tIG0UNbGk01JYvxBzxXQsxmHyYBvspkk6AgO93K41I X-Received: by 2002:a17:902:e886:b0:2c9:b96a:285b with SMTP id d9443c01a7336-2c9b96a2a3fmr22166475ad.33.1782599319091; Sat, 27 Jun 2026 15:28:39 -0700 (PDT) X-Received: by 2002:a17:902:e886:b0:2c9:b96a:285b with SMTP id d9443c01a7336-2c9b96a2a3fmr22166275ad.33.1782599318583; Sat, 27 Jun 2026 15:28:38 -0700 (PDT) Received: from localhost.localdomain (122-63-64-251.mobile.spark.co.nz. [122.63.64.251]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c9deed3733sm2423215ad.23.2026.06.27.15.28.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jun 2026 15:28:37 -0700 (PDT) From: Tao Liu To: pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, bhe@redhat.com, Tao Liu Subject: [PATCH v2] riscv: Fix a NULL pointer reference in machine_kexec_prepare Date: Sun, 28 Jun 2026 10:26:03 +1200 Message-ID: <20260627222602.23594-2-ltao@redhat.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit A NULL pointer reference issue is noticed in riscv's machine_kexec_prepare, where image->segment[i].buf might be NULL and copied unchecked. The NULL buf comes from security/integrity/ima/ima_kexec.c: ima_add_kexec_buffer(), where kbuf is added by kexec_add_buffer(), but kbuf.buffer is NULL. Fix this by simply adding a check before copy. Acked-by: Baoquan He Signed-off-by: Tao Liu --- v2 -> v1: add code comments as suggested by Baoquan. link to v1: https://lore.kernel.org/linux-riscv/20260529032739.13264-2-ltao@redhat.com/ --- arch/riscv/kernel/machine_kexec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/riscv/kernel/machine_kexec.c b/arch/riscv/kernel/machine_kexec.c index 2306ce3e5f22..afc68f6a4aa1 100644 --- a/arch/riscv/kernel/machine_kexec.c +++ b/arch/riscv/kernel/machine_kexec.c @@ -41,6 +41,13 @@ machine_kexec_prepare(struct kimage *image) if (image->segment[i].memsz <= sizeof(fdt)) continue; + /* + * Some segments (e.g. IMA) reserve space but have no buffer + * loaded yet. Skip them as they cannot contain an FDT. + */ + if (image->segment[i].buf == NULL) + continue; + if (image->file_mode) memcpy(&fdt, image->segment[i].buf, sizeof(fdt)); else if (copy_from_user(&fdt, image->segment[i].buf, sizeof(fdt))) -- 2.54.0