Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp764986rdb; Fri, 22 Dec 2023 04:36:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IGuLW6oALEidvul1tP4qHT/gN3Hh2T/8OJTx4vDva659KRM0JrsTvHdEZ5jBmlrlG3zGjPS X-Received: by 2002:ae9:e41a:0:b0:77e:fba3:4f12 with SMTP id q26-20020ae9e41a000000b0077efba34f12mr1434010qkc.104.1703248589834; Fri, 22 Dec 2023 04:36:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703248589; cv=none; d=google.com; s=arc-20160816; b=De/eRZBL5e8J8/vynpcB1+0olNI2yJAZ2ExYZH9lXWX8st7xkLLgww6blCUf1IcDXD LLE/NFI2ywUjHLLrJo6iVXYjCPbPlAYwC9bsrTYu9dbnKs5Jv/UQRHRfWtwpEjqo8feC XTRg+0pXE+6EBhJhm8W7+s7wdDwt6gxZAB8OUy3m8nJmlheVynrZS8U4OVYY2wVZa5Ai gHVxso3j+ub+S/t1CAmAsEVAP3rzqC6fVM708EFJoi62wAT9LVbU6uHqso/9wKLzxK/i ov3HWbequ9JRcGzIPfcBBkbFdtK6mI0IZVd3IPYJuv5DORaIBwVMSEbKBjYsVvYgXhfm bFNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from; bh=qtUhm/r01/YJmMQR9bjChTaRjbi4R9GB5Ylz3qLebrA=; fh=Shk717CEuIFj0H3I5r1l4YwAe1LyRBvfoCzGkZM2NzQ=; b=ulruUwfe8XeYKnrnx2vkjYo7XIYfOiPgVZzkSgDcsWJirDlR2KMPgXVmq5/f+qoR/u RK2hyfnYJ58VX2Tu6J4hiKVG7jplBGEXwO9bm3EzKdN97tNwtN9tElRdw2yH5i/aXXsp zogbaZDewLRxn7lhSdfJysWCKHBjX9QLI3FboHNPh3aQR2Dh/xzGfW+xiCzzrLFkkTt9 cX99+umNFKy54aKirMiGiHIofWw2+k61pgDQtxFVTQ3ujkeIV+LVmBvoRCrSJbYddFX/ jKmzyQFug+xKTAnQCLpsEjNF3gitJ3eQOAjcyrt4O8Ipb5sfaLs8jrKy6YDhRetSTq8q 2JjA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-9710-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9710-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=easystack.cn Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id va23-20020a05620a3f9700b007811e17de8esi3816698qkn.313.2023.12.22.04.36.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 04:36:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-9710-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-9710-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9710-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=easystack.cn Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 93C431C223CF for ; Fri, 22 Dec 2023 12:36:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C4BD81804E; Fri, 22 Dec 2023 12:36:22 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from mail-m12814.netease.com (mail-m12814.netease.com [103.209.128.14]) (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 9AC6C1774D for ; Fri, 22 Dec 2023 12:36:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=easystack.cn Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=easystack.cn Received: from fedora.. (unknown [211.103.144.18]) by smtp.qiye.163.com (Hmail) with ESMTPA id 8979C4C02B1; Fri, 22 Dec 2023 20:18:59 +0800 (CST) From: fuqiang wang To: Baoquan He , Vivek Goyal , Dave Young Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] x86/kexec: fix potential cmem->ranges out of bounds Date: Fri, 22 Dec 2023 20:18:53 +0800 Message-ID: <20231222121855.148215-1-fuqiang.wang@easystack.cn> X-Mailer: git-send-email 2.42.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 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFJQjdXWS1ZQUlXWQ8JGhUIEh9ZQVkZThkaVkIYHh0YGUxOSxlPTFUZERMWGhIXJBQOD1 lXWRgSC1lBWUlKSlVKS0hVSk9PVUpDWVdZFhoPEhUdFFlBWU9LSFVKTU9JTE5VSktLVUpCS0tZBg ++ X-HM-Tid: 0a8c9176eee0022ekunm8979c4c02b1 X-HM-MType: 1 X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6PiI6EQw5Hzc5OSg2LygOFTgu TBMwChFVSlVKTEtISU9MTk9LTkJLVTMWGhIXVR0OChIaFRxVDBoVHDseGggCCA8aGBBVGBVFWVdZ EgtZQVlJSkpVSktIVUpPT1VKQ1lXWQgBWUFITkxKNwY+ In memmap_exclude_ranges(), there will exclude elfheader from crashk_res. In the current x86 architecture code, the elfheader is always allocated at crashk_res.start. It seems that there won't be a split a new range. But it depends on the allocation position of elfheader in crashk_res. To avoid potential out of bounds in future, add a extra slot. The similar issue also exists in fill_up_crash_elf_data(). The range to be excluded is [0, 1M], start (0) is special and will not appear in the middle of existing cmem->ranges[]. But in order to lest the low 1M could be changed in the future, add a extra slot too. Previously discussed link: [1] https://lore.kernel.org/kexec/ZXk2oBf%2FT1Ul6o0c@MiWiFi-R3L-srv/ [2] https://lore.kernel.org/kexec/273284e8-7680-4f5f-8065-c5d780987e59@easystack.cn/ [3] https://lore.kernel.org/kexec/ZYQ6O%2F57sHAPxTHm@MiWiFi-R3L-srv/ Signed-off-by: fuqiang wang --- arch/x86/kernel/crash.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index c92d88680dbf..97d33a6fc4fb 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -149,8 +149,18 @@ static struct crash_mem *fill_up_crash_elf_data(void) /* * Exclusion of crash region and/or crashk_low_res may cause * another range split. So add extra two slots here. + * + * Exclusion of low 1M may not cause another range split, because the + * range of exclude is [0, 1M] and the condition for splitting a new + * region is that the start, end parameters are both in a certain + * existing region in cmem and cannot be equal to existing region's + * start or end. Obviously, the start of [0, 1M] cannot meet this + * condition. + * + * But in order to lest the low 1M could be changed in the future, + * (e.g. [stare, 1M]), add a extra slot. */ - nr_ranges += 2; + nr_ranges += 3; cmem = vzalloc(struct_size(cmem, ranges, nr_ranges)); if (!cmem) return NULL; @@ -282,9 +292,16 @@ int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params) struct crash_memmap_data cmd; struct crash_mem *cmem; - cmem = vzalloc(struct_size(cmem, ranges, 1)); + /* + * In the current x86 architecture code, the elfheader is always + * allocated at crashk_res.start. But it depends on the allocation + * position of elfheader in crashk_res. To avoid potential out of + * bounds in future, add a extra slot. + */ + cmem = vzalloc(struct_size(cmem, ranges, 2)); if (!cmem) return -ENOMEM; + cmem->max_nr_ranges = 2; memset(&cmd, 0, sizeof(struct crash_memmap_data)); cmd.params = params; -- 2.42.0