Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp1272866rwb; Fri, 23 Sep 2022 10:14:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7DoihQefps/SV0hZ659mElpCVrYBk5V0Q063fOvkTtnD/iqhCppJ3DdFRcJRaSTNmx4pMT X-Received: by 2002:a05:6a00:1c98:b0:540:d461:f9d8 with SMTP id y24-20020a056a001c9800b00540d461f9d8mr10206937pfw.29.1663953294149; Fri, 23 Sep 2022 10:14:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663953294; cv=none; d=google.com; s=arc-20160816; b=jdXKsmWhJ7t3fcxogKNB/wLUojPUwV/hT6r9z2rDzVk0QmHmx7BH+mUOmUWv4skcUl +/vrVjEnFxBO4KPoPhpBD04ZsGg7+3gXQod1ITtD5W3wy7pmEee2wGQWDVe4TRkjrfYY EKuvKg7Cciqp4IRO11D6yT2/aHDyzlZkFRYQrzyq+G2lyGY83At5SB0M7l0dwANvd6XZ nMDU9i7/qeSlz9rr101B2c2egenUUtlNy/Z/AW6O7V3o5P6JUOPqdEl7Ti4jOUyIV0dS 8ZMjHJHpJoke4n1hYozb6z3CGDJiyBzG5RMxn8/28a/Da2B5/JTEXfwRCxfKCgbSDPIs Xitg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-signature; bh=ZSPBzEUu4HvvRKKrmrdU/FMS6Qx20fLyxT3yF1tghgc=; b=FjLASDQGFBRO+OnkA7pZWRk9aG+bcPx20W55VM7+F6RK4V/pquQROgdoyXEWEkYcHV 8JijHil1+MK+i9IPAC4ImLtd9BJwAp+8q2xeYkdftYzaXOArqyfj+Ob9LxPTUi1Kiqf3 1XY1b/6u4pjboZa+OM/5Ve8DanOJdp1m3oHLHyX0u032RfbSM0LdXo78mD3QU3ovYV0t pMwR1DhOj9AM8NBeXjUgKyflXvySIyqXq+X/MFZfJG3iU2KtSse2Z8QKiQ2R6oTN3WtG 37rsvV02qHHNjLA0JbBrOupijtrV2YLVxg4/9hUjLh6PCbDZeYe7tJdTItXgzg4z8q7k NP7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=uumJiLIU; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v186-20020a6389c3000000b0043bed49f325si8502709pgd.13.2022.09.23.10.14.41; Fri, 23 Sep 2022 10:14:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=uumJiLIU; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232336AbiIWRKv (ORCPT + 99 others); Fri, 23 Sep 2022 13:10:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232287AbiIWRKr (ORCPT ); Fri, 23 Sep 2022 13:10:47 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B5B41162DB; Fri, 23 Sep 2022 10:10:46 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 9C334219EC; Fri, 23 Sep 2022 17:10:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1663953043; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZSPBzEUu4HvvRKKrmrdU/FMS6Qx20fLyxT3yF1tghgc=; b=uumJiLIU2hCeUjB//pYmunQ3XhUTmH5n97IVRpx0df4OZYv5fuXBQ0xekIy4XJccvKNdf+ ZZ2q/2pniI8zXucmq84IOe9+SqdEoZRhNamUxbx08sYZ/Rz9mhwPlaqhD1IuXjRA5vy2v5 Iqu37b4i4NZhqLy45/3MLfqEcVgd2Os= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1663953043; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZSPBzEUu4HvvRKKrmrdU/FMS6Qx20fLyxT3yF1tghgc=; b=Fngpn3ub5IEe7UJDgzoo8OBgYwiwTJAr8CYGfJ5/Ppmar1cb8XYsiESPKo8Bi3lpB3A8SE scN82gpoaRkfC7CQ== Received: from kitsune.suse.cz (kitsune.suse.cz [10.100.12.127]) by relay2.suse.de (Postfix) with ESMTP id 44B9C2C15B; Fri, 23 Sep 2022 17:10:41 +0000 (UTC) From: Michal Suchanek To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michal Suchanek , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Alexander Gordeev , Sven Schnelle , Philipp Rudo , Sasha Levin , Baoquan He , Alexander Egorenkov , linux-s390@vger.kernel.org (open list:S390), Catalin Marinas , Will Deacon , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), "H. Peter Anvin" , Eric Biederman , Mimi Zohar , "Naveen N. Rao" , Andrew Morton , Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org (moderated list:ARM64 PORT (AARCH64 ARCHITECTURE)), linuxppc-dev@lists.ozlabs.org (open list:LINUX FOR POWERPC (32-BIT AND 64-BIT)), kexec@lists.infradead.org (open list:KEXEC), Coiby Xu , keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, James Morse , AKASHI Takahiro Subject: [PATCH 5.15 0/6] arm64: kexec_file: use more system keyrings to verify kernel image signature + dependencies Date: Fri, 23 Sep 2022 19:10:28 +0200 Message-Id: X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, this is backport of commit 0d519cadf751 ("arm64: kexec_file: use more system keyrings to verify kernel image signature") to table 5.15 tree including the preparatory patches. Some patches needed minor adjustment for context. Thanks Michal Coiby Xu (3): kexec: clean up arch_kexec_kernel_verify_sig kexec, KEYS: make the code in bzImage64_verify_sig generic arm64: kexec_file: use more system keyrings to verify kernel image signature Naveen N. Rao (2): kexec_file: drop weak attribute from functions kexec: drop weak attribute from functions Sven Schnelle (1): s390/kexec_file: move kernel image size check arch/arm64/include/asm/kexec.h | 20 ++++++- arch/arm64/kernel/kexec_image.c | 11 +--- arch/powerpc/include/asm/kexec.h | 14 +++++ arch/s390/boot/head.S | 2 - arch/s390/include/asm/kexec.h | 14 +++++ arch/s390/include/asm/setup.h | 1 - arch/s390/kernel/machine_kexec_file.c | 17 +----- arch/x86/include/asm/kexec.h | 12 ++++ arch/x86/kernel/kexec-bzimage64.c | 20 +------ include/linux/kexec.h | 82 ++++++++++++++++++++++---- kernel/kexec_core.c | 27 --------- kernel/kexec_file.c | 83 ++++++++++----------------- 12 files changed, 163 insertions(+), 140 deletions(-) -- 2.35.3