From e34c59812abf5e3f8e51f85bace48c3d3e5edc36 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Thu, 23 May 2019 16:48:15 +1000 Subject: [PATCH] LU-12331 llite: create obd_device with usercopy whitelist Since kernel 4.16 hardened usercopy has been added, whitelist the struct obd_device to silence the warning. Bad or missing usercopy whitelist? Kernel memory exposure attempt detected from SLUB object 'll_obd_dev_cache' (offset 1256, size 40)! WARNING: CPU: 1 PID: 17534 at mm/usercopy.c:83 usercopy_warn+0x7d/0xa0 Call Trace: __check_object_size+0xfa/0x181 lmv_iocontrol+0x1146/0x1880 [lmv] ll_obd_statfs+0x356/0x860 [lustre] ll_dir_ioctl+0x1e37/0x6760 [lustre] do_vfs_ioctl+0xa4/0x630 Linux-commit: 8eb8284b412906181357c2b0110d879d5af95e52 Test-Parameters: trivial Signed-off-by: Li Dongyang Change-Id: Ie863e8a5e2cebd3fd716e7ccc4e0491f83f6fabc Reviewed-on: https://review.whamcloud.com/34946 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Li Xi Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre/include/lustre_compat.h | 7 +++++++ lustre/obdclass/genops.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lustre/include/lustre_compat.h b/lustre/include/lustre_compat.h index 03a1c3a..920d850 100644 --- a/lustre/include/lustre_compat.h +++ b/lustre/include/lustre_compat.h @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -826,4 +827,10 @@ static inline bool bdev_integrity_enabled(struct block_device *bdev, int rw) #define xa_unlock_irq(lockp) spin_unlock_irq(lockp) #endif +#ifndef KMEM_CACHE_USERCOPY +#define kmem_cache_create_usercopy(name, size, align, flags, useroffset, \ + usersize, ctor) \ + kmem_cache_create(name, size, align, flags, ctor) +#endif + #endif /* _LUSTRE_COMPAT_H */ diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c index 4923838..aac82d2 100644 --- a/lustre/obdclass/genops.c +++ b/lustre/obdclass/genops.c @@ -915,9 +915,9 @@ int obd_init_caches(void) ENTRY; LASSERT(obd_device_cachep == NULL); - obd_device_cachep = kmem_cache_create("ll_obd_dev_cache", - sizeof(struct obd_device), - 0, 0, NULL); + obd_device_cachep = kmem_cache_create_usercopy("ll_obd_dev_cache", + sizeof(struct obd_device), + 0, 0, 0, sizeof(struct obd_device), NULL); if (!obd_device_cachep) GOTO(out, rc = -ENOMEM); -- 1.8.3.1