hulk inclusion category: bugfix bugzilla: 46923 CVE: NA
----------------------------------------------
Enable KTASK in vfio, if the BAR size of some straight through equipment device is too large, it will cause guest crash on booting.
Signed-off-by: Yang Yingliang yangyingliang@huawei.com Reviewed-by: Xie XiuQi xiexiuqi@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init/Kconfig b/init/Kconfig index 6880b55901bb..71b09d998413 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -352,7 +352,7 @@ config AUDIT_TREE config KTASK bool "Multithread CPU-intensive kernel work" depends on SMP - default y + default n help Parallelize CPU-intensive kernel work. This feature is designed for big machines that can take advantage of their extra CPUs to speed up
From: lijinlin lijinlin3@huawei.com
euleros inclusion category: feature feature: add ext3 report error to userspace by netlink bugzilla: NA
--------------------------------
reason: This patch is used to implement abnormal alarm of ext3 file system. You can achieve this by setting "FILESYSTEM_MONITOR" or "FILESYSTEM_ALARM" on in configuration file. With this setting, alarm will be raised whenext3 file system expection occurs.
Signed-off-by: lijinlin lijinlin3@huawei.com Reviewed-by: zhangyi (F) yi.zhang@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- fs/ext4/ext4.h | 3 +++ fs/ext4/super.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index bcaf1538b3ba..8797c05f27c0 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -55,7 +55,10 @@ #endif
#define NL_EXT4_ERROR_GROUP 1 + +#define EXT3_ERROR_MAGIC 0xAE43125U #define EXT4_ERROR_MAGIC 0xAE32014U + struct ext4_err_msg { int magic; char s_id[32]; diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 15af76d547e0..15f8aeda9ee7 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -455,6 +455,8 @@ static void ext4_netlink_send_info(struct super_block *sb, int ext4_errno) struct ext4_err_msg *msg;
if (ext4nl) { + if (IS_EXT2_SB(sb)) + return; size = NLMSG_SPACE(sizeof(struct ext4_err_msg)); skb = alloc_skb(size, GFP_ATOMIC); if (!skb) { @@ -466,7 +468,10 @@ static void ext4_netlink_send_info(struct super_block *sb, int ext4_errno) if (!nlh) goto nlmsg_failure; msg = (struct ext4_err_msg *)NLMSG_DATA(nlh); - msg->magic = EXT4_ERROR_MAGIC; + if (IS_EXT3_SB(sb)) + msg->magic = EXT3_ERROR_MAGIC; + else + msg->magic = EXT4_ERROR_MAGIC; memcpy(msg->s_id, sb->s_id, sizeof(sb->s_id)); msg->s_flags = sb->s_flags; msg->ext4_errno = ext4_errno;
From: zhaoyuxing zhaoyuxing2@huawei.com
euleros inclusion category: bugfix bugzilla: 46914
--------------------------------
Some group may be used to do other processing, but there is no private data to users. Add private_data in struct fsnotify_group, which can be used for special purposes, such as a special flag.
Signed-off-by: zhaoyuxing zhaoyuxing2@huawei.com Reviewed-by: zhangyi (F) yi.zhang@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- include/linux/fsnotify_backend.h | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h index 4599d1c95f8c..01858d5d5a58 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h @@ -201,6 +201,11 @@ struct fsnotify_group { } fanotify_data; #endif /* CONFIG_FANOTIFY */ }; + + KABI_RESERVE(1); + KABI_RESERVE(2); + KABI_RESERVE(3); + KABI_RESERVE(4); };
/* when calling fsnotify tell it if the data is a path or inode */
From: chenmaodong chenmaodong@huawei.com
euleros inclusion catagery: bugfix bugzilla: 46917
-------------------------
virtio_gpu drop reference from allocate in virtio_gpu_gem_create when creating dumb, but after that, this process will continue to use virtio_gpu_object in virtio_gpu_object_attach, which cause uaf. See defail in bugzilla.
Signed-off-by: chenmaodong chenmaodong@huawei.com Reviewed-by: Xie XiuQi xiexiuqi@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 0f2768eacaee..692776abdcf1 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -71,9 +71,6 @@ int virtio_gpu_gem_create(struct drm_file *file,
*obj_p = &obj->gem_base;
- /* drop reference from allocate - handle holds it now */ - drm_gem_object_put_unlocked(&obj->gem_base); - *handle_p = handle; return 0; } @@ -107,6 +104,7 @@ int virtio_gpu_mode_dumb_create(struct drm_file *file_priv, /* attach the object to the resource */ obj = gem_to_virtio_gpu_obj(gobj); ret = virtio_gpu_object_attach(vgdev, obj, resid, NULL); + drm_gem_object_put_unlocked(&obj->gem_base); if (ret) goto fail;
From: gaoyusong gaoyusong1@huawei.com
euleros inclusion category: bugfix bugzilla: 46915
-------------------
Change openeuler defconfig file, set CONFIG_SPI_PL022 to dynamic loading the SPI_PL022 module, on this way can reduce kernel boot time.
Review-by: wanghongzhe wanghongzhe@huawei.com Signed-off-by: gaoyusong gaoyusong1@huawei.com Reviewed-by: Xie XiuQi xiexiuqi@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- arch/arm64/configs/openeuler_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index f306336b7059..14ad41841d17 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -3196,7 +3196,7 @@ CONFIG_SPI_DW_MMIO=m # CONFIG_SPI_GPIO is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_OC_TINY is not set -CONFIG_SPI_PL022=y +CONFIG_SPI_PL022=m # CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_ROCKCHIP is not set CONFIG_SPI_QUP=y
-
Yang Yingliang