From: Greg Kroah-Hartman Date: Wed, 21 Feb 2024 11:11:28 +0000 (+0100) Subject: 6.6-stable patches X-Git-Tag: v4.19.307~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=372a8b79eac1e110ed250ed772654a9ddedaf43c;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: documentation-arch-ia64-features.rst-fix-kernel-feat-directive.patch --- diff --git a/queue-6.6/documentation-arch-ia64-features.rst-fix-kernel-feat-directive.patch b/queue-6.6/documentation-arch-ia64-features.rst-fix-kernel-feat-directive.patch new file mode 100644 index 00000000000..b7f525e903c --- /dev/null +++ b/queue-6.6/documentation-arch-ia64-features.rst-fix-kernel-feat-directive.patch @@ -0,0 +1,52 @@ +From vegard.nossum@oracle.com Wed Feb 21 11:57:46 2024 +From: Vegard Nossum +Date: Mon, 5 Feb 2024 11:39:59 +0100 +Subject: Documentation/arch/ia64/features.rst: fix kernel-feat directive +To: stable@vger.kernel.org +Cc: Greg Kroah-Hartman , Jonathan Corbet , Jani Nikula , Sasha Levin , Mauro Carvalho Chehab , Vegard Nossum , Justin Forbes +Message-ID: <20240205103959.281871-1-vegard.nossum@oracle.com> + +From: Vegard Nossum + +My mainline commit c48a7c44a1d0 ("docs: kernel_feat.py: fix potential +command injection") contains a bug which can manifests like this when +building the documentation: + + Sphinx parallel build error: + UnboundLocalError: local variable 'fname' referenced before assignment + make[2]: *** [Documentation/Makefile:102: htmldocs] Error 2 + +However, this only appears when there exists a '.. kernel-feat::' +directive that points to a non-existent file, which isn't the case in +mainline. + +When this commit was backported to stable 6.6, it didn't change +Documentation/arch/ia64/features.rst since ia64 was removed in 6.7 in +commit cf8e8658100d ("arch: Remove Itanium (IA-64) architecture"). This +lead to the build failure seen above -- but only in stable kernels. + +This patch fixes the backport and should only be applied to kernels where +Documentation/arch/ia64/features.rst exists and commit c48a7c44a1d0 has +also been applied. + +A second patch will follow to fix kernel_feat.py in mainline so that it +doesn't error out when the '.. kernel-feat::' directive points to a +nonexistent file. + +Link: https://lore.kernel.org/all/ZbkfGst991YHqJHK@fedora64.linuxtx.org/ +Fixes: e961f8c6966a ("docs: kernel_feat.py: fix potential command injection") # stable 6.6.15 +Reported-by: Justin Forbes +Reported-y: Salvatore Bonaccorso +Signed-off-by: Vegard Nossum +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/arch/ia64/features.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/arch/ia64/features.rst ++++ b/Documentation/arch/ia64/features.rst +@@ -1,3 +1,3 @@ + .. SPDX-License-Identifier: GPL-2.0 + +-.. kernel-feat:: $srctree/Documentation/features ia64 ++.. kernel-feat:: features ia64 diff --git a/queue-6.6/series b/queue-6.6/series index b4b1b895860..c0e88c25de8 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -333,3 +333,4 @@ of-property-add-in-ports-out-ports-support-to-of_graph_get_port_parent.patch nilfs2-fix-potential-bug-in-end_buffer_async_write.patch dm-limit-the-number-of-targets-and-parameter-size-area.patch x86-barrier-do-not-serialize-msr-accesses-on-amd.patch +documentation-arch-ia64-features.rst-fix-kernel-feat-directive.patch