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.133.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 5A9E335BDAA for ; Sun, 5 Jul 2026 23:33:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783294414; cv=none; b=di1isgAAOzIayw+PN7YLYScV2xnblxrfFfkGIPTdEt0FNNdUwMIqUz9zhMChU5Aikd0ETqTHQnN4Fk4SB8JyS/ZnDd2TcfGHwcl9XpAqvpw5JJpCvIeSOTEOXf4DnHN0I7Nka7LnVRC7cgoHhvrllOdx5PV0p1qv0IGx6xbLQuM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783294414; c=relaxed/simple; bh=KKBCh644BzCDLwoBLFIkcmm2m/854E+YvviVeczjB8k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XRK5R+XjTKdJYVaPm13KJhjYakm0c6ekLgGJ+d63oT/hsnv2IPCA0u8/cLOK/sTpUGiBqr2XME9iLfDJXe7Xz+CF5hWdaAsk9om/a7mOaBhyreWo/ECeYSaIGppKW/7JaXJ27iohrCsnPAJ6lpn9CrlIcv/N+IjzzErAnHmQ7Gw= 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=c5FfFcN/; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=FpnqmFNE; arc=none smtp.client-ip=170.10.133.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="c5FfFcN/"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="FpnqmFNE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1783294412; 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=qWgX8hRK0wDWBZMkA2UqYafCnMgGjGfI+mUA5gi2rBg=; b=c5FfFcN/V7Z9iBa2jcmjyQ86JdDW/lORRjGQKy1wLy0DMFGBh8raat1IrBkitDONKF93IK St730rJW5joqjhdsK77v33vOVr0Hmjl0p0wZIgdkJtlhV/28XvYAMpQEjJ2swKYxX681p5 4E2XDoohxuqaLrNuY7rs3hkOJASRrXU= Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-544-VAxTtqRDNDmW4b1tmX2xqQ-1; Sun, 05 Jul 2026 19:33:30 -0400 X-MC-Unique: VAxTtqRDNDmW4b1tmX2xqQ-1 X-Mimecast-MFC-AGG-ID: VAxTtqRDNDmW4b1tmX2xqQ_1783294410 Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2c8018f11fbso25226885ad.3 for ; Sun, 05 Jul 2026 16:33:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1783294409; x=1783899209; 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=qWgX8hRK0wDWBZMkA2UqYafCnMgGjGfI+mUA5gi2rBg=; b=FpnqmFNEuJ6nXLI34u38m7AWzOSKckRcd4Oil3p0vNBFyl4ZXQnLEtJZuZy4Zars2I rprGplV7Qd1TawcxJkLBRoyFeKTXMJSSVDtO5i9M7F4KFT7TUqU5/yNBUIV7btLL5Bnb B62Fq8rFrEh8k6KY0KVcTfaaAScnwlNZ4GvLRjdPEjVzhBJUmszrlGk1GFZXJKylVrc1 8beS0JG052NRUSutnDhE7yte0M0eaOv/qyFZy3wTeHWyATJeGtJX+LxhR4q9GDgwj0RI hl24/Ocyw2LLKP/b0oUdOMqYhhH+8/9SfMM4ln3Moh9R4jcCuXBf7CamJVvZsWw09eb4 VsIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783294409; x=1783899209; 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=qWgX8hRK0wDWBZMkA2UqYafCnMgGjGfI+mUA5gi2rBg=; b=Y1XXowjHoI5IcnBkX9Z50KIMPirLa+10Gu68YFu9XUSGFLJwSHcnTwuOcBJrJeCgaZ 7zrQXwGDjWlLAXToaHI+kjBXB5Pf+7bKbYh0L+YLLE2TXOKFQxcufRuMvB1BwzvxEk+j VCGi10y/wqwgw/jhja3aO3moGED5ciRHdJqnDORi+ySWwFNB8JBk7AFFVotjrwoFKqqp iBM7+o+cn8y/lT+Vm1EvKnb7T1H2tfnh01nNI9gACjntmfoNaCTcta4MeMLaX1IBJDQc R9ci2cnpTLN/n4EP6CMzU250kI9ybpO/4lkFga6xtp+qXLoO6d72/6+qlItPDgfATUKL xntw== X-Forwarded-Encrypted: i=1; AHgh+RqGO4alqSnpWYBdS1s10Z1vlxqxmfA1zO3Hwe4f+WUgl2WMjJag3b42rPGfKanSTZ5/ZkdmGng=@vger.kernel.org X-Gm-Message-State: AOJu0YxRlM7bQbXuCjIoINLSSwHaCYK3Hqa96s6YM9foLJL8RsLDU8cY yXvTY8DrLghlXSqGcpx7J+nW4FTa+8eL0JQv9rcH8X3Z+Yx82H2R19cj9s/cTtW03h6NRUG1bs4 2KOaxSQJTtx/wV74Fer3bJmUOsERx6nrbB2lhBWlDsEsoqfsHCKy+CAOTEg== X-Gm-Gg: AfdE7cnzkbBPDyf3Iw8QrH7a3RAyMIpPrjbH5GfxXOWRcGBOVqVhW0C+UdGt7bGEd31 YDG0asjQXRFuEvF2/nGm0VGFLWJJ/P3IyE9+KDkB9E8oQRgzIHUBhELkmzo41/A2M+6TqVp//3N Y2QdFc4Eq5fUNTd6vAhSYyNOsPlozO2CsftuXr5rd8+cUJcFzW5ygi2LV/9szRWUicP4PaN8W1N WT6ZUbGNgua4OjKTGM3F4phTxEOUyrpyNYGlcW2OtKFDgxjXVQTqHQCNrnaLUu9MJXAZ59pyZMW a+AtqmaLtszmkrDcCybQD5MnzcfAMY3dh1+c22v5vMDYU65lyrsxMsi2d8guyhRBjNCD4lrNaaN gpaqpZetWzgn3IVXApGQFKXlNeuPQXrsSSmOWiYni+dORblBODiU6tHOBqw== X-Received: by 2002:a17:902:fa84:b0:2ca:52ce:6f91 with SMTP id d9443c01a7336-2cbb9eb434bmr53329275ad.27.1783294409590; Sun, 05 Jul 2026 16:33:29 -0700 (PDT) X-Received: by 2002:a17:902:fa84:b0:2ca:52ce:6f91 with SMTP id d9443c01a7336-2cbb9eb434bmr53328835ad.27.1783294409024; Sun, 05 Jul 2026 16:33:29 -0700 (PDT) Received: from localhost.localdomain.com (122-63-66-137.mobile.spark.co.nz. [122.63.66.137]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cad789237bsm38168945ad.71.2026.07.05.16.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2026 16:33:28 -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, zohar@linux.ibm.com, roberto.sassu@huawei.com, dmitry.kasatkin@gmail.com, eric.snowberg@oracle.com, linux-integrity@vger.kernel.org, pratyush@kernel.org, Markus.Elfring@web.de, kernel-janitors@vger.kernel.org, jarkko@kernel.org, Tao Liu , stable@vger.kernel.org, Nutty Liu Subject: [PATCH v5] riscv: Prevent NULL pointer dereference in machine_kexec_prepare() Date: Mon, 6 Jul 2026 11:27:07 +1200 Message-ID: <20260705232706.30265-2-ltao@redhat.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit A NULL pointer dereference 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 ima_add_kexec_buffer(), where kbuf is added by kexec_add_buffer(), but kbuf.buffer is NULL, then it is copied without a check in machine_kexec_prepare(): kexec_file_load -> kimage_file_alloc_init() -> kimage_file_prepare_segments() -> ima_add_kexec_buffer() -> kexec_add_buffer() -> machine_kexec_prepare() -> memcpy() Address this by adding a check before the data copy attempt. Fixes: b7fb4d78a6ad ("RISC-V: use memcpy for kexec_file mode") Cc: stable@vger.kernel.org Closes: https://lore.kernel.org/kexec/CAO7dBbVftLUhd2qrh7hmijTB3PEPfZAhykCGqEfrPoOcSrrj-w@mail.gmail.com/ Acked-by: Baoquan He Acked-by: Pratyush Yadav Reviewed-by: Nutty Liu Signed-off-by: Tao Liu --- v5 -> v4: 1) Add parentheses to function name in patch subject link to v1: https://lore.kernel.org/linux-riscv/20260529032739.13264-2-ltao@redhat.com/ link to v2: https://lore.kernel.org/linux-riscv/20260627222602.23594-2-ltao@redhat.com/ link to v3: https://lore.kernel.org/linux-riscv/20260701025732.66330-2-ltao@redhat.com/ link to v4: https://lore.kernel.org/linux-riscv/20260703111530.91285-2-ltao@redhat.com/ --- arch/riscv/kernel/machine_kexec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/riscv/kernel/machine_kexec.c b/arch/riscv/kernel/machine_kexec.c index 2306ce3e5f22..738df176ff6f 100644 --- a/arch/riscv/kernel/machine_kexec.c +++ b/arch/riscv/kernel/machine_kexec.c @@ -41,6 +41,9 @@ machine_kexec_prepare(struct kimage *image) if (image->segment[i].memsz <= sizeof(fdt)) continue; + if (!image->segment[i].buf) + 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