On Mon, Feb 05, 2024 at 11:39:59AM +0100, Vegard Nossum wrote:
> 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>
> ---
> Documentation/arch/ia64/features.rst | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/arch/ia64/features.rst b/Documentation/arch/ia64/features.rst
> index d7226fdcf5f8..056838d2ab55 100644
> --- 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
> --
> 2.34.1
Sorry for the delay, now queued up.
greg k-h
