2024-05-28 11:34:22

by Matthias Männich

Subject: [PATCH] kheaders: explicitly define file modes for archived headers

From: Matthias Maennich <[email protected]>

Build environments might be running with different umask settings
resulting in indeterministic file modes for the files contained in
kheaders.tar.xz. The file itself is served with 444, i.e. world
readable. Archive the files explicitly with 744,a+X to improve
reproducibility across build environments.

--mode=0444 is not suitable as directories need to be executable. Also,
444 makes it hard to delete all the readonly files after extraction.

Cc: [email protected]
Cc: [email protected]
Cc: Masahiro Yamada <[email protected]>
Cc: Joel Fernandes <[email protected]>
Signed-off-by: Matthias Maennich <[email protected]>
---
kernel/gen_kheaders.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh
index 6d443ea22bb7..8b6e0c2bc0df 100755
--- a/kernel/gen_kheaders.sh
+++ b/kernel/gen_kheaders.sh
@@ -84,7 +84,7 @@ find $cpio_dir -type f -print0 |

# Create archive and try to normalize metadata for reproducibility.
tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \
- --owner=0 --group=0 --sort=name --numeric-owner \
+ --owner=0 --group=0 --sort=name --numeric-owner --mode=u=rw,go=r,a+X \
-I $XZ -cf $tarfile -C $cpio_dir/ . > /dev/null

echo $headers_md5 > kernel/kheaders.md5
--
2.45.1.288.g0e0cd299f1-goog

2024-05-30 14:30:55

by Masahiro Yamada

Subject: Re: [PATCH] kheaders: explicitly define file modes for archived headers

On Tue, May 28, 2024 at 8:33 PM Matthias Männich <[email protected]> wrote:
>
> From: Matthias Maennich <[email protected]>
>
> Build environments might be running with different umask settings
> resulting in indeterministic file modes for the files contained in
> kheaders.tar.xz. The file itself is served with 444, i.e. world
> readable. Archive the files explicitly with 744,a+X to improve
> reproducibility across build environments.
>
> --mode=0444 is not suitable as directories need to be executable. Also,
> 444 makes it hard to delete all the readonly files after extraction.
>
> Cc: [email protected]
> Cc: [email protected]
> Cc: Masahiro Yamada <[email protected]>
> Cc: Joel Fernandes <[email protected]>
> Signed-off-by: Matthias Maennich <[email protected]>
> ---

Applied to linux-kbuild.
Thanks!



--
Best Regards
Masahiro Yamada