From f0c9ac08ae135e89e0bfbb229622419e816402b3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 13 Feb 2024 15:57:51 +0100 Subject: [PATCH] 5.4-stable patches added patches: vhost-use-kzalloc-instead-of-kmalloc-followed-by-memset.patch --- queue-5.4/series | 1 + ...nstead-of-kmalloc-followed-by-memset.patch | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 queue-5.4/vhost-use-kzalloc-instead-of-kmalloc-followed-by-memset.patch diff --git a/queue-5.4/series b/queue-5.4/series index 3016ccf0538..a2c9e537f15 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -197,3 +197,4 @@ usb-serial-option-add-fibocom-fm101-gl-variant.patch usb-serial-cp210x-add-id-for-imst-im871a-usb.patch hrtimer-report-offline-hrtimer-enqueue.patch input-atkbd-skip-atkbd_cmd_setleds-when-skipping-atkbd_cmd_getid.patch +vhost-use-kzalloc-instead-of-kmalloc-followed-by-memset.patch diff --git a/queue-5.4/vhost-use-kzalloc-instead-of-kmalloc-followed-by-memset.patch b/queue-5.4/vhost-use-kzalloc-instead-of-kmalloc-followed-by-memset.patch new file mode 100644 index 00000000000..275d43b5d02 --- /dev/null +++ b/queue-5.4/vhost-use-kzalloc-instead-of-kmalloc-followed-by-memset.patch @@ -0,0 +1,39 @@ +From 4d8df0f5f79f747d75a7d356d9b9ea40a4e4c8a9 Mon Sep 17 00:00:00 2001 +From: Prathu Baronia +Date: Mon, 22 May 2023 14:20:19 +0530 +Subject: vhost: use kzalloc() instead of kmalloc() followed by memset() + +From: Prathu Baronia + +commit 4d8df0f5f79f747d75a7d356d9b9ea40a4e4c8a9 upstream. + +Use kzalloc() to allocate new zeroed out msg node instead of +memsetting a node allocated with kmalloc(). + +Signed-off-by: Prathu Baronia +Message-Id: <20230522085019.42914-1-prathubaronia2011@gmail.com> +Signed-off-by: Michael S. Tsirkin +Reviewed-by: Stefano Garzarella +Signed-off-by: Ajay Kaher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/vhost/vhost.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/drivers/vhost/vhost.c ++++ b/drivers/vhost/vhost.c +@@ -2583,12 +2583,11 @@ EXPORT_SYMBOL_GPL(vhost_disable_notify); + /* Create a new message. */ + struct vhost_msg_node *vhost_new_msg(struct vhost_virtqueue *vq, int type) + { +- struct vhost_msg_node *node = kmalloc(sizeof *node, GFP_KERNEL); ++ /* Make sure all padding within the structure is initialized. */ ++ struct vhost_msg_node *node = kzalloc(sizeof(*node), GFP_KERNEL); + if (!node) + return NULL; + +- /* Make sure all padding within the structure is initialized. */ +- memset(&node->msg, 0, sizeof node->msg); + node->vq = vq; + node->msg.type = type; + return node; -- 2.47.3