Revision e512a59b472684d8585125101ab03b86c2c1348a authored by Anjali K on 14 June 2024, 17:38:44 UTC, committed by Greg Kroah-Hartman on 25 July 2024, 07:50:53 UTC
[ Upstream commit 1a14150e1656f7a332a943154fc486504db4d586 ]
Reading the dispatch trace log from /sys/kernel/debug/powerpc/dtl/cpu-*
results in a BUG() when the config CONFIG_HARDENED_USERCOPY is enabled as
shown below.
kernel BUG at mm/usercopy.c:102!
Oops: Exception in kernel mode, sig: 5 [#1]
LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA pSeries
Modules linked in: xfs libcrc32c dm_service_time sd_mod t10_pi sg ibmvfc
scsi_transport_fc ibmveth pseries_wdt dm_multipath dm_mirror dm_region_hash dm_log dm_mod fuse
CPU: 27 PID: 1815 Comm: python3 Not tainted 6.10.0-rc3 #85
Hardware name: IBM,9040-MRX POWER10 (raw) 0x800200 0xf000006 of:IBM,FW1060.00 (NM1060_042) hv:phyp pSeries
NIP: c0000000005d23d4 LR: c0000000005d23d0 CTR: 00000000006ee6f8
REGS: c000000120c078c0 TRAP: 0700 Not tainted (6.10.0-rc3)
MSR: 8000000000029033 <SF,EE,ME,IR,DR,RI,LE> CR: 2828220f XER: 0000000e
CFAR: c0000000001fdc80 IRQMASK: 0
[ ... GPRs omitted ... ]
NIP [c0000000005d23d4] usercopy_abort+0x78/0xb0
LR [c0000000005d23d0] usercopy_abort+0x74/0xb0
Call Trace:
usercopy_abort+0x74/0xb0 (unreliable)
__check_heap_object+0xf8/0x120
check_heap_object+0x218/0x240
__check_object_size+0x84/0x1a4
dtl_file_read+0x17c/0x2c4
full_proxy_read+0x8c/0x110
vfs_read+0xdc/0x3a0
ksys_read+0x84/0x144
system_call_exception+0x124/0x330
system_call_vectored_common+0x15c/0x2ec
--- interrupt: 3000 at 0x7fff81f3ab34
Commit 6d07d1cd300f ("usercopy: Restrict non-usercopy caches to size 0")
requires that only whitelisted areas in slab/slub objects can be copied to
userspace when usercopy hardening is enabled using CONFIG_HARDENED_USERCOPY.
Dtl contains hypervisor dispatch events which are expected to be read by
privileged users. Hence mark this safe for user access.
Specify useroffset=0 and usersize=DISPATCH_LOG_BYTES to whitelist the
entire object.
Co-developed-by: Vishal Chourasia <vishalc@linux.ibm.com>
Signed-off-by: Vishal Chourasia <vishalc@linux.ibm.com>
Signed-off-by: Anjali K <anjalik@linux.ibm.com>
Reviewed-by: Srikar Dronamraju <srikar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240614173844.746818-1-anjalik@linux.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent cf3f203
| File | Mode | Size |
|---|---|---|
| asymmetric_keys | ||
| async_tx | ||
| 842.c | -rw-r--r-- | 3.7 KB |
| Kconfig | -rw-r--r-- | 38.1 KB |
| Makefile | -rw-r--r-- | 8.2 KB |
| acompress.c | -rw-r--r-- | 6.1 KB |
| adiantum.c | -rw-r--r-- | 19.4 KB |
| aead.c | -rw-r--r-- | 8.7 KB |
| aegis-neon.h | -rw-r--r-- | 612 bytes |
| aegis.h | -rw-r--r-- | 2.5 KB |
| aegis128-core.c | -rw-r--r-- | 15.6 KB |
| aegis128-neon-inner.c | -rw-r--r-- | 8.4 KB |
| aegis128-neon.c | -rw-r--r-- | 1.6 KB |
| aes_generic.c | -rw-r--r-- | 57.6 KB |
| aes_ti.c | -rw-r--r-- | 2.0 KB |
| af_alg.c | -rw-r--r-- | 28.8 KB |
| ahash.c | -rw-r--r-- | 15.6 KB |
| akcipher.c | -rw-r--r-- | 8.0 KB |
| algapi.c | -rw-r--r-- | 24.6 KB |
| algboss.c | -rw-r--r-- | 5.3 KB |
| algif_aead.c | -rw-r--r-- | 15.4 KB |
| algif_hash.c | -rw-r--r-- | 9.6 KB |
| algif_rng.c | -rw-r--r-- | 8.4 KB |
| algif_skcipher.c | -rw-r--r-- | 9.3 KB |
| ansi_cprng.c | -rw-r--r-- | 10.8 KB |
| anubis.c | -rw-r--r-- | 27.8 KB |
| api.c | -rw-r--r-- | 15.8 KB |
| arc4.c | -rw-r--r-- | 2.1 KB |
| aria_generic.c | -rw-r--r-- | 7.5 KB |
| authenc.c | -rw-r--r-- | 13.0 KB |
| authencesn.c | -rw-r--r-- | 14.1 KB |
| blake2b_generic.c | -rw-r--r-- | 5.9 KB |
| blowfish_common.c | -rw-r--r-- | 15.5 KB |
| blowfish_generic.c | -rw-r--r-- | 3.1 KB |
| camellia_generic.c | -rw-r--r-- | 34.0 KB |
| cast5_generic.c | -rw-r--r-- | 20.4 KB |
| cast6_generic.c | -rw-r--r-- | 9.1 KB |
| cast_common.c | -rw-r--r-- | 12.9 KB |
| cbc.c | -rw-r--r-- | 5.2 KB |
| ccm.c | -rw-r--r-- | 23.4 KB |
| cfb.c | -rw-r--r-- | 6.2 KB |
| chacha20poly1305.c | -rw-r--r-- | 17.4 KB |
| chacha_generic.c | -rw-r--r-- | 3.9 KB |
| cipher.c | -rw-r--r-- | 3.2 KB |
| cmac.c | -rw-r--r-- | 8.0 KB |
| compress.c | -rw-r--r-- | 921 bytes |
| compress.h | -rw-r--r-- | 724 bytes |
| crc32_generic.c | -rw-r--r-- | 2.8 KB |
| crc32c_generic.c | -rw-r--r-- | 4.1 KB |
| crc64_rocksoft_generic.c | -rw-r--r-- | 1.9 KB |
| crct10dif_common.c | -rw-r--r-- | 3.6 KB |
| crct10dif_generic.c | -rw-r--r-- | 3.1 KB |
| cryptd.c | -rw-r--r-- | 29.2 KB |
| crypto_engine.c | -rw-r--r-- | 19.4 KB |
| crypto_null.c | -rw-r--r-- | 5.3 KB |
| crypto_user_base.c | -rw-r--r-- | 12.0 KB |
| crypto_user_stat.c | -rw-r--r-- | 4.0 KB |
| ctr.c | -rw-r--r-- | 9.6 KB |
| cts.c | -rw-r--r-- | 11.4 KB |
| curve25519-generic.c | -rw-r--r-- | 2.2 KB |
| deflate.c | -rw-r--r-- | 7.7 KB |
| des_generic.c | -rw-r--r-- | 3.3 KB |
| dh.c | -rw-r--r-- | 29.1 KB |
| dh_helper.c | -rw-r--r-- | 3.2 KB |
| drbg.c | -rw-r--r-- | 60.3 KB |
| ecb.c | -rw-r--r-- | 2.4 KB |
| ecc.c | -rw-r--r-- | 42.1 KB |
| ecc_curve_defs.h | -rw-r--r-- | 3.7 KB |
| ecdh.c | -rw-r--r-- | 5.8 KB |
| ecdh_helper.c | -rw-r--r-- | 2.0 KB |
| ecdsa.c | -rw-r--r-- | 9.3 KB |
| ecdsasignature.asn1 | -rw-r--r-- | 111 bytes |
| echainiv.c | -rw-r--r-- | 4.1 KB |
| ecrdsa.c | -rw-r--r-- | 8.4 KB |
| ecrdsa_defs.h | -rw-r--r-- | 7.2 KB |
| ecrdsa_params.asn1 | -rw-r--r-- | 142 bytes |
| ecrdsa_pub_key.asn1 | -rw-r--r-- | 57 bytes |
| essiv.c | -rw-r--r-- | 17.9 KB |
| fcrypt.c | -rw-r--r-- | 18.0 KB |
| fips.c | -rw-r--r-- | 2.1 KB |
| gcm.c | -rw-r--r-- | 29.7 KB |
| geniv.c | -rw-r--r-- | 3.8 KB |
| ghash-generic.c | -rw-r--r-- | 4.8 KB |
| hash.h | -rw-r--r-- | 1.1 KB |
| hash_info.c | -rw-r--r-- | 1.9 KB |
| hctr2.c | -rw-r--r-- | 16.7 KB |
| hmac.c | -rw-r--r-- | 6.8 KB |
| internal.h | -rw-r--r-- | 5.7 KB |
| jitterentropy-kcapi.c | -rw-r--r-- | 10.7 KB |
| jitterentropy-testing.c | -rw-r--r-- | 7.0 KB |
| jitterentropy.c | -rw-r--r-- | 23.7 KB |
| jitterentropy.h | -rw-r--r-- | 1.2 KB |
| kdf_sp800108.c | -rw-r--r-- | 3.7 KB |
| keywrap.c | -rw-r--r-- | 9.5 KB |
| khazad.c | -rw-r--r-- | 51.8 KB |
| kpp.c | -rw-r--r-- | 4.2 KB |
| lrw.c | -rw-r--r-- | 10.5 KB |
| lz4.c | -rw-r--r-- | 3.3 KB |
| lz4hc.c | -rw-r--r-- | 3.4 KB |
| lzo-rle.c | -rw-r--r-- | 3.4 KB |
| lzo.c | -rw-r--r-- | 3.3 KB |
| md4.c | -rw-r--r-- | 5.9 KB |
| md5.c | -rw-r--r-- | 7.4 KB |
| michael_mic.c | -rw-r--r-- | 3.4 KB |
| nhpoly1305.c | -rw-r--r-- | 7.8 KB |
| ofb.c | -rw-r--r-- | 2.5 KB |
| pcbc.c | -rw-r--r-- | 4.7 KB |
| pcrypt.c | -rw-r--r-- | 9.2 KB |
| poly1305_generic.c | -rw-r--r-- | 3.7 KB |
| polyval-generic.c | -rw-r--r-- | 6.6 KB |
| proc.c | -rw-r--r-- | 2.6 KB |
| ripemd.h | -rw-r--r-- | 655 bytes |
| rmd160.c | -rw-r--r-- | 12.4 KB |
| rng.c | -rw-r--r-- | 5.5 KB |
| rsa-pkcs1pad.c | -rw-r--r-- | 17.0 KB |
| rsa.c | -rw-r--r-- | 7.4 KB |
| rsa_helper.c | -rw-r--r-- | 4.0 KB |
| rsaprivkey.asn1 | -rw-r--r-- | 316 bytes |
| rsapubkey.asn1 | -rw-r--r-- | 82 bytes |
| scatterwalk.c | -rw-r--r-- | 2.0 KB |
| scompress.c | -rw-r--r-- | 6.8 KB |
| seed.c | -rw-r--r-- | 17.2 KB |
| seqiv.c | -rw-r--r-- | 4.5 KB |
| serpent_generic.c | -rw-r--r-- | 19.6 KB |
| sha1_generic.c | -rw-r--r-- | 2.3 KB |
| sha256_generic.c | -rw-r--r-- | 3.1 KB |
| sha3_generic.c | -rw-r--r-- | 8.0 KB |
| sha512_generic.c | -rw-r--r-- | 7.7 KB |
| shash.c | -rw-r--r-- | 17.9 KB |
| sig.c | -rw-r--r-- | 3.7 KB |
| simd.c | -rw-r--r-- | 13.5 KB |
| skcipher.c | -rw-r--r-- | 26.1 KB |
| sm2.c | -rw-r--r-- | 10.5 KB |
| sm2signature.asn1 | -rw-r--r-- | 113 bytes |
| sm3.c | -rw-r--r-- | 7.8 KB |
| sm3_generic.c | -rw-r--r-- | 2.1 KB |
| sm4.c | -rw-r--r-- | 5.6 KB |
| sm4_generic.c | -rw-r--r-- | 2.1 KB |
| streebog_generic.c | -rw-r--r-- | 57.6 KB |
| tcrypt.c | -rw-r--r-- | 77.7 KB |
| tcrypt.h | -rw-r--r-- | 3.1 KB |
| tea.c | -rw-r--r-- | 6.5 KB |
| testmgr.c | -rw-r--r-- | 152.3 KB |
| testmgr.h | -rw-r--r-- | 1.5 MB |
| twofish_common.c | -rw-r--r-- | 37.1 KB |
| twofish_generic.c | -rw-r--r-- | 5.5 KB |
| vmac.c | -rw-r--r-- | 18.9 KB |
| wp512.c | -rw-r--r-- | 59.7 KB |
| xcbc.c | -rw-r--r-- | 6.7 KB |
| xctr.c | -rw-r--r-- | 5.3 KB |
| xor.c | -rw-r--r-- | 3.8 KB |
| xts.c | -rw-r--r-- | 11.9 KB |
| xxhash_generic.c | -rw-r--r-- | 2.4 KB |
| zstd.c | -rw-r--r-- | 5.0 KB |
Computing file changes ...
