linux-kernel - [PATCH] vfio/platform: Use common error handling code in vfio_set

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <f1977c1c-1c55-4194-9f72-f77120b2e4e5@web.de>
Date: Mon, 15 Jan 2024 18:16:01 +0100
From: Markus Elfring <Markus.Elfring@....de>
To: kvm@...r.kernel.org, kernel-janitors@...r.kernel.org,
 Alex Williamson <alex.williamson@...hat.com>,
 Eric Auger <eric.auger@...hat.com>
Cc: LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] vfio/platform: Use common error handling code in
 vfio_set_trigger()

From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Mon, 15 Jan 2024 18:08:29 +0100

Add a jump target so that a bit of exception handling can be better reused
in an if branch of this function.

Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
 drivers/vfio/platform/vfio_platform_irq.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c
index 61a1bfb68ac7..8604ce4f3fee 100644
--- a/drivers/vfio/platform/vfio_platform_irq.c
+++ b/drivers/vfio/platform/vfio_platform_irq.c
@@ -193,8 +193,8 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index,

 	trigger = eventfd_ctx_fdget(fd);
 	if (IS_ERR(trigger)) {
-		kfree(irq->name);
-		return PTR_ERR(trigger);
+		ret = PTR_ERR(trigger);
+		goto free_name;
 	}

 	irq->trigger = trigger;
@@ -202,9 +202,10 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index,
 	irq_set_status_flags(irq->hwirq, IRQ_NOAUTOEN);
 	ret = request_irq(irq->hwirq, handler, 0, irq->name, irq);
 	if (ret) {
-		kfree(irq->name);
 		eventfd_ctx_put(trigger);
 		irq->trigger = NULL;
+free_name:
+		kfree(irq->name);
 		return ret;
 	}

--
2.43.0