From nobody Fri Dec 19 00:33:18 2025 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6590111AF for ; Fri, 15 Dec 2023 08:09:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gvoo24Gv" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6ceb93fb381so259724b3a.0 for ; Fri, 15 Dec 2023 00:09:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702627797; x=1703232597; darn=vger.kernel.org; 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=g0/MBCfdXawjZKv2ZV3awmKhfLQGaRPuP5dSW02Zx1g=; b=gvoo24GvDl8ETyUAUFrlXXuZPAf1aFYlVIvZKLt2W5aIXoSr5EY2i1FdKlqs6vJRtC qYo8e6L3MtrZsiR0gsVxzwmN5/tDqBOKqI05wZEeUeXPQG67wRW5E+HJ5y2FfJXiF5p5 WrjSvT5koJfoSRxOpgI3A9N0MjBMxKefs5ipNNpteH7YunD3WAN71O2oxsA29qiUGrg7 cEa0UPr2O+4ak2d3t4r2kaMxQJZ9PXh97xEvWV7frtakylVEuSBklzLriSwwEhLh1Vju Wv6zr04Gh5H8o5d0I/JCldmvAP4AvbR842uSo+chYDg412uqtvJivNDbB0T4lJBiUn5z 1JbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702627798; x=1703232598; 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=g0/MBCfdXawjZKv2ZV3awmKhfLQGaRPuP5dSW02Zx1g=; b=ChfGnNby6IcnFkedKZzoQqSMZ175C0bUSS0gk0FBULgmVc/qLyyUzo0wYPPxFSiI5j wL74s/bRhX5cJnxx67BqLcExEfW0KesTy8HNfZbmN1PKghaUtW2L+hYxa/EnwkA+LfkX vmjpz8DH1ns0ixHbO8BlCL3FqnEz/F9UW6EnEJx2WnJh4zHdSreUBSx7FjhadPHW8VSG w39Jyj8oaa5JPGANVaMAwgNnC7dbOuIZmbZReAO6Sh9ERa6ympep/UfS33zpg9ya8/xr IJTr+bCAFqzSe3RaDRD8UOG2I6Gg/2pHBlLGDPSllK+GsLhWl9rWzXcDwIThuCW218tE qf8g== X-Gm-Message-State: AOJu0Yx9/UDyhSAF+iaiiRBsuQ+Qh77bKIP/SvuV7WC975YSVFlqp4Nx 9D9KXqViDdd0EPbXiSmQBrKd4iiSXbQ= X-Google-Smtp-Source: AGHT+IFJGQnjFgAMnUCZUi9/NN5yXdMK/QUUi/s5YLp19cYbU54DBnzCc7uUZLehiHETGePvX24pXg== X-Received: by 2002:a05:6a00:6c9e:b0:6d2:6918:d039 with SMTP id jc30-20020a056a006c9e00b006d26918d039mr2591566pfb.22.1702627797500; Fri, 15 Dec 2023 00:09:57 -0800 (PST) Received: from code.. ([144.202.108.46]) by smtp.gmail.com with ESMTPSA id d8-20020a056a00198800b006cee656cb35sm11783792pfl.156.2023.12.15.00.09.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 00:09:57 -0800 (PST) From: Yuntao Wang To: linux-kernel@vger.kernel.org, kexec@lists.infradead.org, x86@kernel.org Cc: Andrew Morton , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Jonathan Corbet , Eric Biederman , Yuntao Wang Subject: [PATCH 1/3] kexec_file: fix incorrect end value passed to kimage_is_destination_range() Date: Fri, 15 Dec 2023 16:09:08 +0800 Message-ID: <20231215080910.173338-2-ytcoode@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231215080910.173338-1-ytcoode@gmail.com> References: <20231215080910.173338-1-ytcoode@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The end parameter received by kimage_is_destination_range() should be the last valid byte address of the target memory segment plus 1. However, in the locate_mem_hole_bottom_up() and locate_mem_hole_top_down() functions, the corresponding value passed to kimage_is_destination_range() is the last valid byte address of the target memory segment, which is 1 less. Fix it. Signed-off-by: Yuntao Wang --- kernel/kexec_file.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index f9a419cd22d4..26be070d3bdd 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -435,13 +435,12 @@ static int locate_mem_hole_top_down(unsigned long sta= rt, unsigned long end, if (temp_start < start || temp_start < kbuf->buf_min) return 0; =20 - temp_end =3D temp_start + kbuf->memsz - 1; - /* * Make sure this does not conflict with any of existing * segments */ - if (kimage_is_destination_range(image, temp_start, temp_end)) { + if (kimage_is_destination_range(image, temp_start, + temp_start + kbuf->memsz)) { temp_start =3D temp_start - PAGE_SIZE; continue; } @@ -475,7 +474,7 @@ static int locate_mem_hole_bottom_up(unsigned long star= t, unsigned long end, * Make sure this does not conflict with any of existing * segments */ - if (kimage_is_destination_range(image, temp_start, temp_end)) { + if (kimage_is_destination_range(image, temp_start, temp_end + 1)) { temp_start =3D temp_start + PAGE_SIZE; continue; } --=20 2.43.0 From nobody Fri Dec 19 00:33:18 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D895017981 for ; Fri, 15 Dec 2023 08:10:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cNk9e8PW" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6ce7632b032so155642b3a.1 for ; Fri, 15 Dec 2023 00:10:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702627803; x=1703232603; darn=vger.kernel.org; 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=sICzlYhaSfeV+0O8ybAajGk8fmRoPkGoJtHOPJtKgUM=; b=cNk9e8PWUD7XMBzEF6I6Z+tin57f8mtN7o0Fx7D5m0klA/J+2RzSk+V2DzetjkuPMy HYLHHwwgkmvj6kVkf1rNpB6I7jLv3TDiTUZ+tf6mhelO9p2opaQSZemmNMDVRd6Bzamb BU0Nu8ZSF/r0lLeuk4z9uyDfM7bglBilia2E3WePKrMXsAWEBL/ufk52HtMpMZJq9PC8 ViWF/Dz+O7IFPYm5Ld3sTPDZ2FrSDgrHa2ekAimw79SLTJu7BgNT4gFeFLXlBMCwL1Qb 4QOz1fVV0HEEfdvhBUFqUwLHkAneSnC4+8vhPrwPpkTF7SsXjHVPb3MkPWiKN6bVGfyH a9SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702627803; x=1703232603; 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=sICzlYhaSfeV+0O8ybAajGk8fmRoPkGoJtHOPJtKgUM=; b=YlERiJ64IPUQ5eDqJSVaim9Ka3RvhSVe8TGy/IdHj10P/U6B8uss1iKFNADwv5ciyT 2ZZMP956tinXlhK+gX8mK9O+mHxt6eJ32jEZFYHlFLT6ElxYmLYBh5B8wv8MTY1uy/ON 9cx7j3Wk1hRYGHWgTVI0WT35VKUhJp0gf9tQmNeL1NIch10B8Lxajhj//u73V8tmLUFA jmxNf5AwrdHKlisbCbyX0mTOnF6iZryCgIiODPZ2AZCRGANd0DYS64AJWO4hvZlU0/wu 1AAeKr0nkgBxt8WxiJMT34Psg7p7O9Oz3kiJ4vukB0dPNc5lKP4GCXV98ZCw4+FpicDt oQvg== X-Gm-Message-State: AOJu0YxLJsow9Nr4d4jK+W0rUBI5Cjj7vh+qKSoZW0zHkAgdZIbFnh+9 5KEHvv3bC6HxoErdajWLrqjzz+b6/Fs= X-Google-Smtp-Source: AGHT+IHxPXj3XYid69vOvuBnwTPo836bhjrwQT+9xxJqSFiSTCYQpfkUC3ihozMaJJmBd/eshU7Vng== X-Received: by 2002:a05:6a00:d76:b0:6ce:f665:ab1 with SMTP id n54-20020a056a000d7600b006cef6650ab1mr3875430pfv.11.1702627802891; Fri, 15 Dec 2023 00:10:02 -0800 (PST) Received: from code.. ([144.202.108.46]) by smtp.gmail.com with ESMTPSA id d8-20020a056a00198800b006cee656cb35sm11783792pfl.156.2023.12.15.00.09.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 00:10:02 -0800 (PST) From: Yuntao Wang To: linux-kernel@vger.kernel.org, kexec@lists.infradead.org, x86@kernel.org Cc: Andrew Morton , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Jonathan Corbet , Eric Biederman , Yuntao Wang Subject: [PATCH 2/3] kexec_file: fix incorrect temp_start value in locate_mem_hole_top_down() Date: Fri, 15 Dec 2023 16:09:09 +0800 Message-ID: <20231215080910.173338-3-ytcoode@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231215080910.173338-1-ytcoode@gmail.com> References: <20231215080910.173338-1-ytcoode@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" temp_end represents the address of the last available byte. Therefore, the starting address of the memory segment with temp_end as its last available byte and a size of `kbuf->memsz`, that is, the value of temp_start, should be `temp_end - kbuf->memsz + 1` instead of `temp_end - kbuf->memsz`. Additionally, use the ALIGN_DOWN macro instead of open-coding it directly in locate_mem_hole_top_down() to improve code readability. Signed-off-by: Yuntao Wang --- kernel/kexec_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 26be070d3bdd..c3bf52a9a8ad 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -426,11 +426,11 @@ static int locate_mem_hole_top_down(unsigned long sta= rt, unsigned long end, unsigned long temp_start, temp_end; =20 temp_end =3D min(end, kbuf->buf_max); - temp_start =3D temp_end - kbuf->memsz; + temp_start =3D temp_end - kbuf->memsz + 1; =20 do { /* align down start */ - temp_start =3D temp_start & (~(kbuf->buf_align - 1)); + temp_start =3D ALIGN_DOWN(temp_start, kbuf->buf_align); =20 if (temp_start < start || temp_start < kbuf->buf_min) return 0; --=20 2.43.0 From nobody Fri Dec 19 00:33:18 2025 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7345118C11 for ; Fri, 15 Dec 2023 08:10:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PhcL3mRM" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6ce33234fd7so164062b3a.0 for ; Fri, 15 Dec 2023 00:10:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702627809; x=1703232609; darn=vger.kernel.org; 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=jscYpo84xIlTIrjQEZDT5YAVqLMOQqnP0eOYv7+MbRw=; b=PhcL3mRM/fWe0x2fK9715Zgyr7btw0S9r3b13/smCMVLRWnzf1V8wc+iSrj288cW/I buRQNtosyirMKLGkhFScBCAE01T5FRJVXuVKQA/gbM7tD8NXASZYQIoiHoevchtAu4mI WfjEOHOFytfvAPENwDsZSbgydt090LeMCZvhqzEHdtIeIIe0hGT62mV6rjH59W+Xbg2e oiMA9Nib6O5E70wa6uJ6KB3jeSa9NCvjqwuQdnBLhW6AwFZaAHaDDqz2WZ1JJtXXSQed gaSFCouZ+flY58prx768qpUTHqwhVhrlxhN5a6lWSXbiWX1hZ+EbtvDM6DJ36n9zuSER uDDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702627809; x=1703232609; 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=jscYpo84xIlTIrjQEZDT5YAVqLMOQqnP0eOYv7+MbRw=; b=ZuG1Y6hTYrjd4AHaLK3U50sM7n9LX+zxDpsT4u3cSte8CcAMw1h00FT+2+FZAgnK2H vRXaaT06WJY8zTzexHQH9AU05n24iK1Pmw0ebY+/TpxqsINqgrlE7izrrjNyc+f/UCCu 068aOuYht5oOxSd0tInswPTdM3/nuef0Q9RRyU9bY7/t5AXr/XIdOOwDVrx/ZqiD4NrT dQ0BOLZNwRCwgftPbIuvAc5YQGJP8kTG59jH0KJ7afcZIfUjddyFK+vcCMtQSyR/O8ls mTQ+n8eyudqt3BvSWBsgx6pbSktN5ZtLzUmf8a+6zJ8it/41jUrZF+IKrl7tey932cRK 6bPA== X-Gm-Message-State: AOJu0YzZYBhZIC3vcVW92VoXxPQyfVNj1WEuvQZfXAEVHcL6FcFV1uzK WZ7QQYLx42NCQ+3T7K3A2Sb+FVPAwWo= X-Google-Smtp-Source: AGHT+IFvEn6WjjxL9AELNTiUvLF5ar5KlNxdVOf+PtdHoCcSbpAc03KyD4vE24Y4VgQbfpvos6DDnQ== X-Received: by 2002:a05:6a00:4601:b0:6cb:6a27:ab57 with SMTP id ko1-20020a056a00460100b006cb6a27ab57mr5960984pfb.14.1702627809447; Fri, 15 Dec 2023 00:10:09 -0800 (PST) Received: from code.. ([144.202.108.46]) by smtp.gmail.com with ESMTPSA id d8-20020a056a00198800b006cee656cb35sm11783792pfl.156.2023.12.15.00.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 00:10:09 -0800 (PST) From: Yuntao Wang To: linux-kernel@vger.kernel.org, kexec@lists.infradead.org, x86@kernel.org Cc: Andrew Morton , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Jonathan Corbet , Eric Biederman , Yuntao Wang Subject: [PATCH 3/3] x86/kexec: use pr_err() instead of pr_debug() when an error occurs Date: Fri, 15 Dec 2023 16:09:10 +0800 Message-ID: <20231215080910.173338-4-ytcoode@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231215080910.173338-1-ytcoode@gmail.com> References: <20231215080910.173338-1-ytcoode@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When an error is detected, use pr_err() instead of pr_debug() to output log message. In addition, remove the unnecessary return from set_page_address(). Signed-off-by: Yuntao Wang --- arch/x86/kernel/kexec-bzimage64.c | 2 +- mm/highmem.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzim= age64.c index a61c12c01270..472a45dbc79a 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -424,7 +424,7 @@ static void *bzImage64_load(struct kimage *image, char = *kernel, * command line. Make sure it does not overflow */ if (cmdline_len + MAX_ELFCOREHDR_STR_LEN > header->cmdline_size) { - pr_debug("Appending elfcorehdr=3D to command line exceeds maximum = allowed length\n"); + pr_err("Appending elfcorehdr=3D to command line exceeds maximum al= lowed length\n"); return ERR_PTR(-EINVAL); } =20 diff --git a/mm/highmem.c b/mm/highmem.c index e19269093a93..bd48ba445dd4 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -799,8 +799,6 @@ void set_page_address(struct page *page, void *virtual) } spin_unlock_irqrestore(&pas->lock, flags); } - - return; } =20 void __init page_address_init(void) --=20 2.43.0