This is a note to let you know that I've just added the patch titled
Documentation/arch/ia64/features.rst: fix kernel-feat directive
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
documentation-arch-ia64-features.rst-fix-kernel-feat-directive.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From vegard.nossum@xxxxxxxxxx Wed Feb 21 11:57:46 2024
From: Vegard Nossum <vegard.nossum@xxxxxxxxxx>
Date: Mon, 5 Feb 2024 11:39:59 +0100
Subject: Documentation/arch/ia64/features.rst: fix kernel-feat directive
To: stable@xxxxxxxxxxxxxxx
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Jonathan Corbet <corbet@xxxxxxx>, Jani Nikula <jani.nikula@xxxxxxxxx>, Sasha Levin <sashal@xxxxxxxxxx>, Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>, Vegard Nossum <vegard.nossum@xxxxxxxxxx>, Justin Forbes <jforbes@xxxxxxxxxxxxxxxxx>
Message-ID: <20240205103959.281871-1-vegard.nossum@xxxxxxxxxx>
From: Vegard Nossum <vegard.nossum@xxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxxx/
Fixes: e961f8c6966a ("docs: kernel_feat.py: fix potential command injection") # stable 6.6.15
Reported-by: Justin Forbes <jforbes@xxxxxxxxxxxxxxxxx>
Reported-y: Salvatore Bonaccorso <carnil@xxxxxxxxxx>
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
Patches currently in stable-queue which might be from vegard.nossum@xxxxxxxxxx are
queue-6.6/docs-kernel_feat.py-fix-build-error-for-missing-files.patch
queue-6.6/documentation-arch-ia64-features.rst-fix-kernel-feat-directive.patch
