rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

kernel-6.3.0-0.rc2.20230314gitfc89d7fb499b.24

Browse Source 
* Tue Mar 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.fc89d7fb499b.24]
- kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes (Marco Elver)
- redhat: version two of Makefile.rhelver tweaks (Clark Williams)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2023-03-14 08:02:15 -05:00
parent 8e7884d554
commit ae463591b7
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
26 changed files with 133 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 23 RHEL_RELEASE = 24
# #
# ZSTREAM # ZSTREAM

7
Patchlist.changelog
View File

@ -1,5 +1,8 @@
"https://gitlab.com/cki-project/kernel-ark/-/commit"/a9d4f3471daaa3ce48730242df86d87eb642b650 "https://gitlab.com/cki-project/kernel-ark/-/commit"/f41ceac0577068e8fbca14e8ffa6a20b1a224355
a9d4f3471daaa3ce48730242df86d87eb642b650 redhat: version two of Makefile.rhelver tweaks f41ceac0577068e8fbca14e8ffa6a20b1a224355 kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes
"https://gitlab.com/cki-project/kernel-ark/-/commit"/f4c6ecf081ec0b529479e57d6575a05a2058453c
f4c6ecf081ec0b529479e57d6575a05a2058453c redhat: version two of Makefile.rhelver tweaks
"https://gitlab.com/cki-project/kernel-ark/-/commit"/7bfeffd1d37b3bc7d86247c53843762b4e97c62b "https://gitlab.com/cki-project/kernel-ark/-/commit"/7bfeffd1d37b3bc7d86247c53843762b4e97c62b
7bfeffd1d37b3bc7d86247c53843762b4e97c62b redhat: adapt to upstream Makefile change 7bfeffd1d37b3bc7d86247c53843762b4e97c62b redhat: adapt to upstream Makefile change

6
kernel-aarch64-debug-fedora.config
View File

@ -8957,13 +8957,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
CONFIG_VIDEO_IMX7_CSI=m CONFIG_VIDEO_IMX7_CSI=m
CONFIG_VIDEO_IMX8_JPEG=m CONFIG_VIDEO_IMX8_JPEG=m
CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m
@ -9019,7 +9019,7 @@ CONFIG_VIDEO_OV7640=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

4
kernel-aarch64-debug-rhel.config
View File

@ -1040,9 +1040,6 @@ CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
# CONFIG_CRYPTO_AES_TI is not set # CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
# CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set
# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set
# CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set
# CONFIG_CRYPTO_ARIA is not set # CONFIG_CRYPTO_ARIA is not set
CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B=m CONFIG_CRYPTO_BLAKE2B=m
@ -1164,7 +1161,6 @@ CONFIG_CRYPTO_SHA3=y
CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM2 is not set
# CONFIG_CRYPTO_SM3_ARM64_CE is not set # CONFIG_CRYPTO_SM3_ARM64_CE is not set
# CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
# CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3_GENERIC is not set
# CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3 is not set
# CONFIG_CRYPTO_SM3_NEON is not set # CONFIG_CRYPTO_SM3_NEON is not set

6
kernel-aarch64-fedora.config
View File

@ -8934,13 +8934,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
CONFIG_VIDEO_IMX7_CSI=m CONFIG_VIDEO_IMX7_CSI=m
CONFIG_VIDEO_IMX8_JPEG=m CONFIG_VIDEO_IMX8_JPEG=m
CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m
@ -8996,7 +8996,7 @@ CONFIG_VIDEO_OV7640=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

4
kernel-aarch64-rhel.config
View File

@ -1040,9 +1040,6 @@ CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
# CONFIG_CRYPTO_AES_TI is not set # CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
# CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set
# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set
# CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set
# CONFIG_CRYPTO_ARIA is not set # CONFIG_CRYPTO_ARIA is not set
CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B=m CONFIG_CRYPTO_BLAKE2B=m
@ -1164,7 +1161,6 @@ CONFIG_CRYPTO_SHA3=y
CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM2 is not set
# CONFIG_CRYPTO_SM3_ARM64_CE is not set # CONFIG_CRYPTO_SM3_ARM64_CE is not set
# CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
# CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3_GENERIC is not set
# CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3 is not set
# CONFIG_CRYPTO_SM3_NEON is not set # CONFIG_CRYPTO_SM3_NEON is not set

6
kernel-armv7hl-debug-fedora.config
View File

@ -9018,13 +9018,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
CONFIG_VIDEO_IMX7_CSI=m CONFIG_VIDEO_IMX7_CSI=m
# CONFIG_VIDEO_IMX8_JPEG is not set # CONFIG_VIDEO_IMX8_JPEG is not set
CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m
@ -9086,7 +9086,7 @@ CONFIG_VIDEO_OV7670=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

6
kernel-armv7hl-fedora.config
View File

@ -8997,13 +8997,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
CONFIG_VIDEO_IMX7_CSI=m CONFIG_VIDEO_IMX7_CSI=m
# CONFIG_VIDEO_IMX8_JPEG is not set # CONFIG_VIDEO_IMX8_JPEG is not set
CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m
@ -9065,7 +9065,7 @@ CONFIG_VIDEO_OV7670=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

6
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -8779,13 +8779,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
CONFIG_VIDEO_IMX7_CSI=m CONFIG_VIDEO_IMX7_CSI=m
# CONFIG_VIDEO_IMX8_JPEG is not set # CONFIG_VIDEO_IMX8_JPEG is not set
CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m
@ -8842,7 +8842,7 @@ CONFIG_VIDEO_OV7640=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

6
kernel-armv7hl-lpae-fedora.config
View File

@ -8758,13 +8758,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
CONFIG_VIDEO_IMX7_CSI=m CONFIG_VIDEO_IMX7_CSI=m
# CONFIG_VIDEO_IMX8_JPEG is not set # CONFIG_VIDEO_IMX8_JPEG is not set
CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m CONFIG_VIDEO_IMX8MQ_MIPI_CSI2=m
@ -8821,7 +8821,7 @@ CONFIG_VIDEO_OV7640=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

6
kernel-ppc64le-debug-fedora.config
View File

@ -7543,13 +7543,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
# CONFIG_VIDEO_IPU3_CIO2 is not set # CONFIG_VIDEO_IPU3_CIO2 is not set
# CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_ALSA is not set
CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_IVTV=m
@ -7596,7 +7596,7 @@ CONFIG_VIDEO_OV7640=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

4
kernel-ppc64le-debug-rhel.config
View File

@ -875,9 +875,6 @@ CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
# CONFIG_CRYPTO_AES_TI is not set # CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
# CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set
# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set
# CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set
# CONFIG_CRYPTO_ARIA is not set # CONFIG_CRYPTO_ARIA is not set
CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B=m CONFIG_CRYPTO_BLAKE2B=m
@ -993,7 +990,6 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
# CONFIG_CRYPTO_SHA512_ARM64 is not set # CONFIG_CRYPTO_SHA512_ARM64 is not set
CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM2 is not set
# CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
# CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3_GENERIC is not set
# CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3 is not set
# CONFIG_CRYPTO_SM3_NEON is not set # CONFIG_CRYPTO_SM3_NEON is not set

6
kernel-ppc64le-fedora.config
View File

@ -7520,13 +7520,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
# CONFIG_VIDEO_IPU3_CIO2 is not set # CONFIG_VIDEO_IPU3_CIO2 is not set
# CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_ALSA is not set
CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_IVTV=m
@ -7573,7 +7573,7 @@ CONFIG_VIDEO_OV7640=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

4
kernel-ppc64le-rhel.config
View File

@ -875,9 +875,6 @@ CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
# CONFIG_CRYPTO_AES_TI is not set # CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
# CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set
# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set
# CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set
# CONFIG_CRYPTO_ARIA is not set # CONFIG_CRYPTO_ARIA is not set
CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B=m CONFIG_CRYPTO_BLAKE2B=m
@ -993,7 +990,6 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
# CONFIG_CRYPTO_SHA512_ARM64 is not set # CONFIG_CRYPTO_SHA512_ARM64 is not set
CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM2 is not set
# CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
# CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3_GENERIC is not set
# CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3 is not set
# CONFIG_CRYPTO_SM3_NEON is not set # CONFIG_CRYPTO_SM3_NEON is not set

6
kernel-s390x-debug-fedora.config
View File

@ -7494,13 +7494,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
# CONFIG_VIDEO_IPU3_CIO2 is not set # CONFIG_VIDEO_IPU3_CIO2 is not set
# CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_ALSA is not set
CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_IVTV=m
@ -7547,7 +7547,7 @@ CONFIG_VIDEO_OV7640=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

4
kernel-s390x-debug-rhel.config
View File

@ -874,9 +874,6 @@ CONFIG_CRYPTO_AES_S390=m
# CONFIG_CRYPTO_AES_TI is not set # CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
# CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set
# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set
# CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set
# CONFIG_CRYPTO_ARIA is not set # CONFIG_CRYPTO_ARIA is not set
CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B=m CONFIG_CRYPTO_BLAKE2B=m
@ -994,7 +991,6 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
CONFIG_CRYPTO_SHA512_S390=y CONFIG_CRYPTO_SHA512_S390=y
CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM2 is not set
# CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
# CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3_GENERIC is not set
# CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3 is not set
# CONFIG_CRYPTO_SM3_NEON is not set # CONFIG_CRYPTO_SM3_NEON is not set

6
kernel-s390x-fedora.config
View File

@ -7471,13 +7471,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
# CONFIG_VIDEO_IPU3_CIO2 is not set # CONFIG_VIDEO_IPU3_CIO2 is not set
# CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_ALSA is not set
CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_IVTV=m
@ -7524,7 +7524,7 @@ CONFIG_VIDEO_OV7640=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

4
kernel-s390x-rhel.config
View File

@ -874,9 +874,6 @@ CONFIG_CRYPTO_AES_S390=m
# CONFIG_CRYPTO_AES_TI is not set # CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_ANSI_CPRNG=m
# CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set
# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set
# CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set
# CONFIG_CRYPTO_ARIA is not set # CONFIG_CRYPTO_ARIA is not set
CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B=m CONFIG_CRYPTO_BLAKE2B=m
@ -994,7 +991,6 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
CONFIG_CRYPTO_SHA512_S390=y CONFIG_CRYPTO_SHA512_S390=y
CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM2 is not set
# CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
# CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3_GENERIC is not set
# CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3 is not set
# CONFIG_CRYPTO_SM3_NEON is not set # CONFIG_CRYPTO_SM3_NEON is not set

4
kernel-s390x-zfcpdump-rhel.config
View File

@ -879,9 +879,6 @@ CONFIG_CRYPTO_AES_S390=y
# CONFIG_CRYPTO_AES_TI is not set # CONFIG_CRYPTO_AES_TI is not set
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_CRYPTO_ANSI_CPRNG=y
# CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set
# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set
# CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set
# CONFIG_CRYPTO_ARIA is not set # CONFIG_CRYPTO_ARIA is not set
# CONFIG_CRYPTO_AUTHENC is not set # CONFIG_CRYPTO_AUTHENC is not set
CONFIG_CRYPTO_BLAKE2B=y CONFIG_CRYPTO_BLAKE2B=y
@ -999,7 +996,6 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=m
CONFIG_CRYPTO_SHA512_S390=y CONFIG_CRYPTO_SHA512_S390=y
CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM2 is not set
# CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
# CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3_GENERIC is not set
# CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3 is not set
# CONFIG_CRYPTO_SM3_NEON is not set # CONFIG_CRYPTO_SM3_NEON is not set

6
kernel-x86_64-debug-fedora.config
View File

@ -7961,13 +7961,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
CONFIG_VIDEO_IPU3_CIO2=m CONFIG_VIDEO_IPU3_CIO2=m
CONFIG_VIDEO_IPU3_IMGU=m CONFIG_VIDEO_IPU3_IMGU=m
# CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_ALSA is not set
@ -8015,7 +8015,7 @@ CONFIG_VIDEO_OV7640=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

2
kernel-x86_64-debug-rhel.config
View File

@ -4391,7 +4391,7 @@ CONFIG_PINCTRL_LEWISBURG=m
# CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_LYNXPOINT is not set
# CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MCP23S08 is not set
# CONFIG_PINCTRL_MDM9615 is not set # CONFIG_PINCTRL_MDM9615 is not set
# CONFIG_PINCTRL_METEORLAKE is not set CONFIG_PINCTRL_METEORLAKE=m
# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
# CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8226 is not set
# CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM8976 is not set

6
kernel-x86_64-fedora.config
View File

@ -7939,13 +7939,13 @@ CONFIG_VIDEO_IMX219=m
CONFIG_VIDEO_IMX258=m CONFIG_VIDEO_IMX258=m
CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX274=m
CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX290=m
# CONFIG_VIDEO_IMX296 is not set CONFIG_VIDEO_IMX296=m
CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX319=m
CONFIG_VIDEO_IMX334=m CONFIG_VIDEO_IMX334=m
CONFIG_VIDEO_IMX335=m CONFIG_VIDEO_IMX335=m
CONFIG_VIDEO_IMX355=m CONFIG_VIDEO_IMX355=m
CONFIG_VIDEO_IMX412=m CONFIG_VIDEO_IMX412=m
# CONFIG_VIDEO_IMX415 is not set CONFIG_VIDEO_IMX415=m
CONFIG_VIDEO_IPU3_CIO2=m CONFIG_VIDEO_IPU3_CIO2=m
CONFIG_VIDEO_IPU3_IMGU=m CONFIG_VIDEO_IPU3_IMGU=m
# CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_ALSA is not set
@ -7993,7 +7993,7 @@ CONFIG_VIDEO_OV7640=m
CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV772X=m
CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8856=m
# CONFIG_VIDEO_OV8858 is not set CONFIG_VIDEO_OV8858=m
CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV8865=m
CONFIG_VIDEO_OV9282=m CONFIG_VIDEO_OV9282=m
CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9640=m

2
kernel-x86_64-rhel.config
View File

@ -4370,7 +4370,7 @@ CONFIG_PINCTRL_LEWISBURG=m
# CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_LYNXPOINT is not set
# CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MCP23S08 is not set
# CONFIG_PINCTRL_MDM9615 is not set # CONFIG_PINCTRL_MDM9615 is not set
# CONFIG_PINCTRL_METEORLAKE is not set CONFIG_PINCTRL_METEORLAKE=m
# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
# CONFIG_PINCTRL_MSM8226 is not set # CONFIG_PINCTRL_MSM8226 is not set
# CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM8976 is not set

18
kernel.spec
View File

@ -143,13 +143,13 @@ Summary: The Linux kernel
# define buildid .local # define buildid .local
%define specversion 6.3.0 %define specversion 6.3.0
%define patchversion 6.3 %define patchversion 6.3
%define pkgrelease 0.rc2.23 %define pkgrelease 0.rc2.20230314gitfc89d7fb499b.24
%define kversion 6 %define kversion 6
%define tarfile_release 6.3-rc2 %define tarfile_release 6.3-rc2-6-gfc89d7fb499b
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 3 %define patchlevel 3
# This allows pkg_release to have configurable %%{?dist} tag # This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc2.23%{?buildid}%{?dist} %define specrelease 0.rc2.20230314gitfc89d7fb499b.24%{?buildid}%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 6.3.0 %define kabiversion 6.3.0
@ -1636,7 +1636,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt" OPTS="$OPTS -m $opt"
done done
%endif %endif
RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=%{name} ./process_configs.sh $OPTS ${specversion} RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=%{name} ./process_configs.sh $OPTS %{specversion}
cp %{SOURCE82} . cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@ -3362,9 +3362,17 @@ fi
# #
# #
%changelog %changelog
* Mon Mar 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.23] * Tue Mar 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.fc89d7fb499b.24]
- kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes (Marco Elver)
- redhat: version two of Makefile.rhelver tweaks (Clark Williams) - redhat: version two of Makefile.rhelver tweaks (Clark Williams)
* Tue Mar 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.fc89d7fb499b.23]
- redhat/kernel.spec.template: Fix typo for process_configs.sh call (Neal Gompa)
- redhat/configs: CONFIG_CRYPTO_SM3_AVX_X86_64 is x86 only (Vladis Dronov)
- redhat/configs: Enable CONFIG_PINCTRL_METEORLAKE in RHEL (Prarit Bhargava)
- fedora: enable new image sensors (Peter Robinson)
- Linux v6.3.0-0.rc2.fc89d7fb499b
* Mon Mar 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.22] * Mon Mar 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc2.22]
- Linux v6.3.0-0.rc2 - Linux v6.3.0-0.rc2

173
patch-6.3-redhat.patch
View File

@ -5,6 +5,9 @@
arch/arm/Kconfig | 4 +- arch/arm/Kconfig | 4 +-
arch/arm64/Kconfig | 3 +- arch/arm64/Kconfig | 3 +-
arch/arm64/kernel/acpi.c | 4 + arch/arm64/kernel/acpi.c | 4 +
arch/powerpc/include/asm/kasan.h | 2 +-
arch/powerpc/include/asm/string.h | 15 +-
arch/powerpc/kernel/prom_init_check.sh | 9 +-
arch/s390/include/asm/ipl.h | 1 + arch/s390/include/asm/ipl.h | 1 +
arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/ipl.c | 5 +
arch/s390/kernel/setup.c | 4 + arch/s390/kernel/setup.c | 4 +
@ -64,7 +67,7 @@
security/lockdown/Kconfig | 13 + security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 + security/lockdown/lockdown.c | 1 +
security/security.c | 6 + security/security.c | 6 +
66 files changed, 1544 insertions(+), 189 deletions(-) 69 files changed, 1563 insertions(+), 196 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 6221a1d057dd..90c169923eda 100644 index 6221a1d057dd..90c169923eda 100644
@ -206,6 +209,75 @@ index dba8fcec7f33..e4e33ecfefa9 100644
static bool param_acpi_force __initdata; static bool param_acpi_force __initdata;
static int __init parse_acpi(char *arg) static int __init parse_acpi(char *arg)
diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h
index 92a968202ba7..365d2720097c 100644
--- a/arch/powerpc/include/asm/kasan.h
+++ b/arch/powerpc/include/asm/kasan.h
@@ -2,7 +2,7 @@
#ifndef __ASM_KASAN_H
#define __ASM_KASAN_H
-#ifdef CONFIG_KASAN
+#if defined(CONFIG_KASAN) && !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX)
#define _GLOBAL_KASAN(fn) _GLOBAL(__##fn)
#define _GLOBAL_TOC_KASAN(fn) _GLOBAL_TOC(__##fn)
#define EXPORT_SYMBOL_KASAN(fn) EXPORT_SYMBOL(__##fn)
diff --git a/arch/powerpc/include/asm/string.h b/arch/powerpc/include/asm/string.h
index 2aa0e31e6884..60ba22770f51 100644
--- a/arch/powerpc/include/asm/string.h
+++ b/arch/powerpc/include/asm/string.h
@@ -30,11 +30,17 @@ extern int memcmp(const void *,const void *,__kernel_size_t);
extern void * memchr(const void *,int,__kernel_size_t);
void memcpy_flushcache(void *dest, const void *src, size_t size);
+#ifdef CONFIG_KASAN
+/* __mem variants are used by KASAN to implement instrumented meminstrinsics. */
+#ifdef CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX
+#define __memset memset
+#define __memcpy memcpy
+#define __memmove memmove
+#else /* CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX */
void *__memset(void *s, int c, __kernel_size_t count);
void *__memcpy(void *to, const void *from, __kernel_size_t n);
void *__memmove(void *to, const void *from, __kernel_size_t n);
-
-#if defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__)
+#ifndef __SANITIZE_ADDRESS__
/*
* For files that are not instrumented (e.g. mm/slub.c) we
* should use not instrumented version of mem* functions.
@@ -46,8 +52,9 @@ void *__memmove(void *to, const void *from, __kernel_size_t n);
#ifndef __NO_FORTIFY
#define __NO_FORTIFY /* FORTIFY_SOURCE uses __builtin_memcpy, etc. */
#endif
-
-#endif
+#endif /* !__SANITIZE_ADDRESS__ */
+#endif /* CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX */
+#endif /* CONFIG_KASAN */
#ifdef CONFIG_PPC64
#ifndef CONFIG_KASAN
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 5a319863f289..69623b9045d5 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -13,8 +13,13 @@
# If you really need to reference something from prom_init.o add
# it to the list below:
-grep "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} >/dev/null
-if [ $? -eq 0 ]
+has_renamed_memintrinsics()
+{
+ grep -q "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} && \
+ ! grep -q "^CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX=y" ${KCONFIG_CONFIG}
+}
+
+if has_renamed_memintrinsics
then
MEM_FUNCS="__memcpy __memset"
else
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
index b0d00032479d..afb9544fb007 100644 index b0d00032479d..afb9544fb007 100644
--- a/arch/s390/include/asm/ipl.h --- a/arch/s390/include/asm/ipl.h
@ -3014,102 +3086,3 @@ index cf6cc576736f..3653a4f35265 100644
#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type) int security_perf_event_open(struct perf_event_attr *attr, int type)
{ {
From 08cebf1329a31940a8783c447969ad09b6d0c607 Mon Sep 17 00:00:00 2001
From: Marco Elver <elver@google.com>
Date: Mon, 27 Feb 2023 10:47:27 +0100
Subject: [PATCH] kasan, powerpc: Don't rename memintrinsics if compiler adds
prefixes
With appropriate compiler support [1], KASAN builds use __asan prefixed
meminstrinsics, and KASAN no longer overrides memcpy/memset/memmove.
If compiler support is detected (CC_HAS_KASAN_MEMINTRINSIC_PREFIX),
define memintrinsics normally (do not prefix '__').
On powerpc, KASAN is the only user of __mem functions, which are used to
define instrumented memintrinsics. Alias the normal versions for KASAN
to use in its implementation.
Link: https://lore.kernel.org/all/20230224085942.1791837-1-elver@google.com/ [1]
Link: https://lore.kernel.org/oe-kbuild-all/202302271348.U5lvmo0S-lkp@intel.com/
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Marco Elver <elver@google.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
---
arch/powerpc/include/asm/kasan.h | 2 +-
arch/powerpc/include/asm/string.h | 15 +++++++++++----
arch/powerpc/kernel/prom_init_check.sh | 9 +++++++--
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h
index 92a968202ba7..365d2720097c 100644
--- a/arch/powerpc/include/asm/kasan.h
+++ b/arch/powerpc/include/asm/kasan.h
@@ -2,7 +2,7 @@
#ifndef __ASM_KASAN_H
#define __ASM_KASAN_H
-#ifdef CONFIG_KASAN
+#if defined(CONFIG_KASAN) && !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX)
#define _GLOBAL_KASAN(fn) _GLOBAL(__##fn)
#define _GLOBAL_TOC_KASAN(fn) _GLOBAL_TOC(__##fn)
#define EXPORT_SYMBOL_KASAN(fn) EXPORT_SYMBOL(__##fn)
diff --git a/arch/powerpc/include/asm/string.h b/arch/powerpc/include/asm/string.h
index 2aa0e31e6884..60ba22770f51 100644
--- a/arch/powerpc/include/asm/string.h
+++ b/arch/powerpc/include/asm/string.h
@@ -30,11 +30,17 @@ extern int memcmp(const void *,const void *,__kernel_size_t);
extern void * memchr(const void *,int,__kernel_size_t);
void memcpy_flushcache(void *dest, const void *src, size_t size);
+#ifdef CONFIG_KASAN
+/* __mem variants are used by KASAN to implement instrumented meminstrinsics. */
+#ifdef CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX
+#define __memset memset
+#define __memcpy memcpy
+#define __memmove memmove
+#else /* CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX */
void *__memset(void *s, int c, __kernel_size_t count);
void *__memcpy(void *to, const void *from, __kernel_size_t n);
void *__memmove(void *to, const void *from, __kernel_size_t n);
-
-#if defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__)
+#ifndef __SANITIZE_ADDRESS__
/*
* For files that are not instrumented (e.g. mm/slub.c) we
* should use not instrumented version of mem* functions.
@@ -46,8 +52,9 @@ void *__memmove(void *to, const void *from, __kernel_size_t n);
#ifndef __NO_FORTIFY
#define __NO_FORTIFY /* FORTIFY_SOURCE uses __builtin_memcpy, etc. */
#endif
-
-#endif
+#endif /* !__SANITIZE_ADDRESS__ */
+#endif /* CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX */
+#endif /* CONFIG_KASAN */
#ifdef CONFIG_PPC64
#ifndef CONFIG_KASAN
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 5a319863f289..69623b9045d5 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -13,8 +13,13 @@
# If you really need to reference something from prom_init.o add
# it to the list below:
-grep "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} >/dev/null
-if [ $? -eq 0 ]
+has_renamed_memintrinsics()
+{
+ grep -q "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} && \
+ ! grep -q "^CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX=y" ${KCONFIG_CONFIG}
+}
+
+if has_renamed_memintrinsics
then
MEM_FUNCS="__memcpy __memset"
else
--
2.39.2

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.3-rc2.tar.xz) = 253957ef494697ef12584bff9316cbae4436b918e42f1b81d9a11d7e66a5e8162036c5ee0ff4d0cfc03defed71b3a2329b32990199530125d4eedd52204ebcda SHA512 (linux-6.3-rc2-6-gfc89d7fb499b.tar.xz) = 60f187af2bc34ee83ee7815208ffa85e235de3147f37c7cf2f3ad20d358f315a874daea1fc722bd68d12f974a6909dca7c6561d73a04e848c0d2ad00b2347792
SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 28d40d3d54fa53f3926246361d3dc076e5a36892e311094e90425ade9649ece555aec6ab28c504d8795f5056d1652eea22c1ad485e4d67c470a38da6333f98c7 SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = f6090ff59ed26447da9eb3936e28a59b3416402fa328417e1d89c6fde4f3217c347886b537f33fec9c3d4035ffa89da1ee8192b1b6544d8b5eb31fd81d29b261
SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = e7fc2106b02c7ea5c8d2860a0ac25d1ed420984039a2f16e8fd2df9d0238314f57360c4db5da5f2353185b66a4c4022be9c34d5abb60d0001fa140e69fb7a56e SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = d25a6f16095f25aa3b86874892fa4f5fd1e2f83865409193b9c34b00d353b37943b4d7fc821738aacc150982ca93564d94d120e5e886e7ebd2872fe1dc39c9a9