From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 54AFA22E3E6; Thu, 17 Apr 2025 18:14:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744913658; cv=none; b=HksKgpdzKvhtXU9bwzqxE4NYN+Zf5W/sKmgXKT8iQTB5rDRLzSS5Xx0s9o/P2izgWsft8xqV+wRORoMDI9g00w7FYp6QbzvNTBbDelyWtk6taKO9lfTY1kpYSCtnrR9LyNoj4pZgPwg0rQAuJsFxUw7N+hXgVk2CWLdynfDxFs8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744913658; c=relaxed/simple; bh=nUGJCoia7ACftgXrLhlZ98RAdTikjG8iQYMwIqf2xZ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lrmqvsL7wWgSyO1mVD/qg0gTfC95WW7JbiD5igSYSjchhywMiF4szJ8Vh1Sc3ns0+4ex7Anl+YnrJwkFFRbaCY3JyOG/xCYEA9A5RibTrYLMoeDs/w3zjKAybdn40grgfvMiUUcX8rbNsJknKpH1WEvqWWTZOPT2fYY/0bPphN8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HDyO6QJ6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HDyO6QJ6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4719C4CEE4; Thu, 17 Apr 2025 18:14:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744913658; bh=nUGJCoia7ACftgXrLhlZ98RAdTikjG8iQYMwIqf2xZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HDyO6QJ6neO7VznXEc0NAxseVMoplTh1nRugE9C2fa2tHxbCF2p6Uaao+1+Pcawzi LfAHM71mPx7Z/MzPccZlYabtbRaJNpoBLJiv8uciRY4GIInciOLS8tRJcLlxP085in 9OFfmK2b3BysD0VP8TZXw5T/kWWeZQhsXlHe4+LI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?G=C3=BCnther=20Noack?= , =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= Subject: [PATCH 6.14 410/449] landlock: Prepare to add second errata Date: Thu, 17 Apr 2025 19:51:38 +0200 Message-ID: <20250417175134.783136027@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175117.964400335@linuxfoundation.org> References: <20250417175117.964400335@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mickaël Salaün commit 6d9ac5e4d70eba3e336f9809ba91ab2c49de6d87 upstream. Potentially include errata for Landlock ABI v5 (Linux 6.10) and v6 (Linux 6.12). That will be useful for the following signal scoping erratum. As explained in errata.h, this commit should be backportable without conflict down to ABI v5. It must then not include the errata/abi-6.h file. Fixes: 54a6e6bbf3be ("landlock: Add signal scoping") Cc: Günther Noack Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250318161443.279194-5-mic@digikod.net Signed-off-by: Mickaël Salaün Signed-off-by: Greg Kroah-Hartman --- security/landlock/errata.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- a/security/landlock/errata.h +++ b/security/landlock/errata.h @@ -63,6 +63,18 @@ static const struct landlock_erratum lan #endif #undef LANDLOCK_ERRATA_ABI +#define LANDLOCK_ERRATA_ABI 5 +#if __has_include("errata/abi-5.h") +#include "errata/abi-5.h" +#endif +#undef LANDLOCK_ERRATA_ABI + +#define LANDLOCK_ERRATA_ABI 6 +#if __has_include("errata/abi-6.h") +#include "errata/abi-6.h" +#endif +#undef LANDLOCK_ERRATA_ABI + /* * For each new erratum, we need to include all the ABI files up to the impacted * ABI to make all potential future intermediate errata easy to backport.