FAILED: patch "[PATCH] scsi: xen: scsiback: Fix potential memory leak in" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 901a5f309daba412e2a30364d7ec1492fa11c32c
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026012625-perky-unquote-b3a5@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 901a5f309daba412e2a30364d7ec1492fa11c32c Mon Sep 17 00:00:00 2001
From: Abdun Nihaal <[email protected]>
Date: Tue, 23 Dec 2025 12:00:11 +0530
Subject: [PATCH] scsi: xen: scsiback: Fix potential memory leak in
scsiback_remove()
Memory allocated for struct vscsiblk_info in scsiback_probe() is not freed in scsiback_remove() leading to potential memory leaks on remove, as well as in the scsiback_probe() error paths. Fix that by freeing it in scsiback_remove().
drivers/xen/xen-scsiback.c +1 -0
@@ -1262,6 +1262,7 @@ static void scsiback_remove(struct xenbus_device *dev)gnttab_page_cache_shrink (&info->free_pages,0 );dev_set_drvdata (&dev->dev,NULL ); +kfree (info); } static int scsiback_probe(struct xenbus_device *dev,
Sasha Levin
maintainerPATCH 1/2 xen: make remove callback of xen driver void returned
From: Dawei Li <[email protected]>
[ Upstream commit 7cffcade57a429667447c4f41d8414bbcf1b3aaa ]
Since commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller.
This change is for xen bus based drivers.
Stable-dep-of: 901a5f309dab ("scsi: xen: scsiback: Fix potential memory leak in scsiback_remove()")
--- drivers/block/xen-blkback/xenbus.c | 4 +--- drivers/block/xen-blkfront.c | 3 +-- drivers/char/tpm/xen-tpmfront.c | 3 +-- drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- drivers/input/misc/xen-kbdfront.c | 5 ++--- drivers/net/xen-netback/xenbus.c | 3 +-- drivers/net/xen-netfront.c | 4 +--- drivers/pci/xen-pcifront.c | 4 +--- drivers/scsi/xen-scsifront.c | 4 +--- drivers/tty/hvc/hvc_xen.c | 4 ++-- drivers/usb/host/xen-hcd.c | 4 +--- drivers/video/fbdev/xen-fbfront.c | 6 ++---- drivers/xen/pvcalls-back.c | 3 +-- drivers/xen/pvcalls-front.c | 3 +-- drivers/xen/xen-pciback/xenbus.c | 4 +--- drivers/xen/xen-scsiback.c | 4 +--- include/xen/xenbus.h | 2 +- net/9p/trans_xen.c | 3 +-- sound/xen/xen_snd_front.c | 3 +-- 19 files changed, 22 insertions(+), 47 deletions(-)
drivers/block/xen-blkback/xenbus.c +1 -3
@@ -524,7 +524,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,return 0 ; } -static int xen_blkbk_remove (struct xenbus_device *dev) +static void xen_blkbk_remove (struct xenbus_device *dev) {struct backend_info *be =dev_get_drvdata (&dev->dev);
@@ -547,8 +547,6 @@ static int xen_blkbk_remove(struct xenbus_device *dev)/* Put the reference we set in xen_blkif_alloc(). */ xen_blkif_put (be->blkif); } - -return 0 ; } int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt,
drivers/block/xen-blkfront.c +1 -2
@@ -2469,7 +2469,7 @@ static void blkback_changed(struct xenbus_device *dev, } } -static int blkfront_remove (struct xenbus_device *xbdev) +static void blkfront_remove (struct xenbus_device *xbdev) {struct blkfront_info *info =dev_get_drvdata (&xbdev->dev);
@@ -2490,7 +2490,6 @@ static int blkfront_remove(struct xenbus_device *xbdev) }kfree (info); -return 0 ; }static int blkfront_is_ready (struct xenbus_device *dev)
drivers/char/tpm/xen-tpmfront.c +1 -2
@@ -360,14 +360,13 @@ static int tpmfront_probe(struct xenbus_device *dev,return tpm_chip_register (priv->chip); } -static int tpmfront_remove (struct xenbus_device *dev) +static void tpmfront_remove (struct xenbus_device *dev) {struct tpm_chip *chip =dev_get_drvdata (&dev->dev);struct tpm_private *priv =dev_get_drvdata (&chip->dev);tpm_chip_unregister (chip);ring_free (priv);dev_set_drvdata (&chip->dev,NULL ); -return 0 ; }static int tpmfront_resume (struct xenbus_device *dev)
drivers/gpu/drm/xen/xen_drm_front.c +1 -2
@@ -717,7 +717,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,return xenbus_switch_state (xb_dev, XenbusStateInitialising); } -static int xen_drv_remove (struct xenbus_device *dev) +static void xen_drv_remove (struct xenbus_device *dev) {struct xen_drm_front_info *front_info =dev_get_drvdata (&dev->dev);int to =100 ;
@@ -751,7 +751,6 @@ static int xen_drv_remove(struct xenbus_device *dev)xen_drm_drv_fini (front_info);xenbus_frontend_closed (dev); -return 0 ; }static const struct xenbus_device_id xen_driver_ids[] = {
drivers/input/misc/xen-kbdfront.c +2 -3
@@ -51,7 +51,7 @@ module_param_array(ptr_size, int, NULL, 0444);MODULE_PARM_DESC (ptr_size,"Pointing device width, height in pixels (default 800,600)" ); -static int xenkbd_remove (struct xenbus_device *); +static void xenkbd_remove (struct xenbus_device *);static int xenkbd_connect_backend (struct xenbus_device *,struct xenkbd_info *);static void xenkbd_disconnect_backend (struct xenkbd_info *);
@@ -404,7 +404,7 @@ static int xenkbd_resume(struct xenbus_device *dev)return xenkbd_connect_backend (dev, info); } -static int xenkbd_remove (struct xenbus_device *dev) +static void xenkbd_remove (struct xenbus_device *dev) {struct xenkbd_info *info =dev_get_drvdata (&dev->dev);
@@ -417,7 +417,6 @@ static int xenkbd_remove(struct xenbus_device *dev)input_unregister_device (info->mtouch);free_page ((unsigned long )info->page);kfree (info); -return 0 ; } static int xenkbd_connect_backend(struct xenbus_device *dev,
drivers/net/xen-netback/xenbus.c +1 -2
@@ -977,7 +977,7 @@ static int read_xenbus_vif_flags(struct backend_info *be)return 0 ; } -static int netback_remove (struct xenbus_device *dev) +static void netback_remove (struct xenbus_device *dev) {struct backend_info *be =dev_get_drvdata (&dev->dev);
@@ -992,7 +992,6 @@ static int netback_remove(struct xenbus_device *dev)kfree (be->hotplug_script);kfree (be);dev_set_drvdata (&dev->dev,NULL ); -return 0 ; }/*
drivers/net/xen-netfront.c +1 -3
@@ -2652,7 +2652,7 @@ static void xennet_bus_close(struct xenbus_device *dev) }while (!ret); } -static int xennet_remove (struct xenbus_device *dev) +static void xennet_remove (struct xenbus_device *dev) {struct netfront_info *info =dev_get_drvdata (&dev->dev);
@@ -2668,8 +2668,6 @@ static int xennet_remove(struct xenbus_device *dev)rtnl_unlock (); }xennet_free_netdev (info->netdev); - -return 0 ; }static const struct xenbus_device_id netfront_ids[] = {
drivers/pci/xen-pcifront.c +1 -3
@@ -1055,14 +1055,12 @@ static int pcifront_xenbus_probe(struct xenbus_device *xdev,return err; } -static int pcifront_xenbus_remove (struct xenbus_device *xdev) +static void pcifront_xenbus_remove (struct xenbus_device *xdev) {struct pcifront_device *pdev =dev_get_drvdata (&xdev->dev);if (pdev)free_pdev (pdev); - -return 0 ; }static const struct xenbus_device_id xenpci_ids[] = {
drivers/scsi/xen-scsifront.c +1 -3
@@ -995,7 +995,7 @@ static int scsifront_suspend(struct xenbus_device *dev)return err; } -static int scsifront_remove (struct xenbus_device *dev) +static void scsifront_remove (struct xenbus_device *dev) {struct vscsifrnt_info *info =dev_get_drvdata (&dev->dev);
@@ -1011,8 +1011,6 @@ static int scsifront_remove(struct xenbus_device *dev)scsifront_free_ring (info);scsi_host_put (info->host); - -return 0 ; }static void scsifront_disconnect (struct vscsifrnt_info *info)
drivers/tty/hvc/hvc_xen.c +2 -2
@@ -420,9 +420,9 @@ static int xen_console_remove(struct xencons_info *info)return 0 ; } -static int xencons_remove (struct xenbus_device *dev) +static void xencons_remove (struct xenbus_device *dev) { -return xen_console_remove (dev_get_drvdata (&dev->dev)); +xen_console_remove (dev_get_drvdata (&dev->dev)); } static int xencons_connect_backend(struct xenbus_device *dev,
drivers/usb/host/xen-hcd.c +1 -3
@@ -1530,15 +1530,13 @@ static void xenhcd_backend_changed(struct xenbus_device *dev, } } -static int xenhcd_remove (struct xenbus_device *dev) +static void xenhcd_remove (struct xenbus_device *dev) {struct xenhcd_info *info =dev_get_drvdata (&dev->dev);struct usb_hcd *hcd =xenhcd_info_to_hcd (info);xenhcd_destroy_rings (info);usb_put_hcd (hcd); - -return 0 ; } static int xenhcd_probe(struct xenbus_device *dev,
drivers/video/fbdev/xen-fbfront.c +2 -4
@@ -67,7 +67,7 @@ MODULE_PARM_DESC(video, "Video memory size in MB, width, height in pixels (default 2,800,600)");static void xenfb_make_preferred_console (void ); -static int xenfb_remove (struct xenbus_device *); +static void xenfb_remove (struct xenbus_device *);static void xenfb_init_shared_page (struct xenfb_info *,struct fb_info *);static int xenfb_connect_backend (struct xenbus_device *,struct xenfb_info *);static void xenfb_disconnect_backend (struct xenfb_info *);
@@ -527,7 +527,7 @@ static int xenfb_resume(struct xenbus_device *dev)return xenfb_connect_backend (dev, info); } -static int xenfb_remove (struct xenbus_device *dev) +static void xenfb_remove (struct xenbus_device *dev) {struct xenfb_info *info =dev_get_drvdata (&dev->dev);
@@ -542,8 +542,6 @@ static int xenfb_remove(struct xenbus_device *dev)vfree (info->gfns);vfree (info->fb);kfree (info); - -return 0 ; }static unsigned long vmalloc_to_gfn (void *address)
drivers/xen/pvcalls-back.c +1 -2
@@ -1180,9 +1180,8 @@ static void pvcalls_back_changed(struct xenbus_device *dev, } } -static int pvcalls_back_remove (struct xenbus_device *dev) +static void pvcalls_back_remove (struct xenbus_device *dev) { -return 0 ; } static int pvcalls_back_uevent(struct xenbus_device *xdev,
drivers/xen/pvcalls-front.c +1 -2
@@ -1087,7 +1087,7 @@ static const struct xenbus_device_id pvcalls_front_ids[] = { { "" } }; -static int pvcalls_front_remove (struct xenbus_device *dev) +static void pvcalls_front_remove (struct xenbus_device *dev) {struct pvcalls_bedata *bedata;struct sock_mapping *map =NULL , *n;
@@ -1123,7 +1123,6 @@ static int pvcalls_front_remove(struct xenbus_device *dev)kfree (bedata->ring.sring);kfree (bedata);xenbus_switch_state (dev, XenbusStateClosed); -return 0 ; } static int pvcalls_front_probe(struct xenbus_device *dev,
drivers/xen/xen-pciback/xenbus.c +1 -3
@@ -716,14 +716,12 @@ static int xen_pcibk_xenbus_probe(struct xenbus_device *dev,return err; } -static int xen_pcibk_xenbus_remove (struct xenbus_device *dev) +static void xen_pcibk_xenbus_remove (struct xenbus_device *dev) {struct xen_pcibk_device *pdev =dev_get_drvdata (&dev->dev);if (pdev !=NULL )free_pdev (pdev); - -return 0 ; }static const struct xenbus_device_id xen_pcibk_ids[] = {
drivers/xen/xen-scsiback.c +1 -3
@@ -1249,7 +1249,7 @@ static void scsiback_release_translation_entry(struct vscsibk_info *info)spin_unlock_irqrestore (&info->v2p_lock, flags); } -static int scsiback_remove (struct xenbus_device *dev) +static void scsiback_remove (struct xenbus_device *dev) {struct vscsibk_info *info =dev_get_drvdata (&dev->dev);
@@ -1261,8 +1261,6 @@ static int scsiback_remove(struct xenbus_device *dev)gnttab_page_cache_shrink (&info->free_pages,0 );dev_set_drvdata (&dev->dev,NULL ); - -return 0 ; } static int scsiback_probe(struct xenbus_device *dev,
include/xen/xenbus.h +1 -1
@@ -117,7 +117,7 @@ struct xenbus_driver { const struct xenbus_device_id *id);void (*otherend_changed)(struct xenbus_device *dev,enum xenbus_state backend_state); -int (*remove)(struct xenbus_device *dev); +void (*remove)(struct xenbus_device *dev);int (*suspend)(struct xenbus_device *dev);int (*resume)(struct xenbus_device *dev);int (*uevent)(struct xenbus_device *,struct kobj_uevent_env *);
net/9p/trans_xen.c +1 -2
@@ -307,13 +307,12 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv)kfree (priv); } -static int xen_9pfs_front_remove (struct xenbus_device *dev) +static void xen_9pfs_front_remove (struct xenbus_device *dev) {struct xen_9pfs_front_priv *priv =dev_get_drvdata (&dev->dev);dev_set_drvdata (&dev->dev,NULL );xen_9pfs_front_free (priv); -return 0 ; } static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev,
sound/xen/xen_snd_front.c +1 -2
@@ -311,7 +311,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,return xenbus_switch_state (xb_dev, XenbusStateInitialising); } -static int xen_drv_remove (struct xenbus_device *dev) +static void xen_drv_remove (struct xenbus_device *dev) {struct xen_snd_front_info *front_info =dev_get_drvdata (&dev->dev);int to =100 ;
@@ -345,7 +345,6 @@ static int xen_drv_remove(struct xenbus_device *dev)xen_snd_drv_fini (front_info);xenbus_frontend_closed (dev); -return 0 ; }static const struct xenbus_device_id xen_drv_ids[] = {
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/2 scsi: xen: scsiback: Fix potential memory leak in scsiback_remove()
From: Abdun Nihaal <[email protected]>
[ Upstream commit 901a5f309daba412e2a30364d7ec1492fa11c32c ]
Memory allocated for struct vscsiblk_info in scsiback_probe() is not freed in scsiback_remove() leading to potential memory leaks on remove, as well as in the scsiback_probe() error paths. Fix that by freeing it in scsiback_remove().
--- drivers/xen/xen-scsiback.c | 1 + 1 file changed, 1 insertion(+)
drivers/xen/xen-scsiback.c +1 -0
@@ -1261,6 +1261,7 @@ static void scsiback_remove(struct xenbus_device *dev)gnttab_page_cache_shrink (&info->free_pages,0 );dev_set_drvdata (&dev->dev,NULL ); +kfree (info); } static int scsiback_probe(struct xenbus_device *dev,
Signature · 1 line
2.51.0