linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dongliang Mu <mudongliangabcd@gmail.com>
To: Antti Palosaari <crope@iki.fi>,
	Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Dongliang Mu <mudongliangabcd@gmail.com>,
	linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] media: msi2500: fix UAF in the msi2500_disconnect
Date: Wed, 17 Nov 2021 00:32:07 +0800	[thread overview]
Message-ID: <20211116163208.75879-1-mudongliangabcd@gmail.com> (raw)

In msi2500_probe, it invokes spi_alloc_master to allocate master
controller and spi_register_master to register master controller.
Then in msi2500_disconnect, it calls spi_unregister_master to unregister
the master controller. And in spi_unregister_master, it calls put_device
to decrease the refcount and the device object will be freed then. As a
result, the dereference of dev->lock will cause a use-after-free bug.

Fix it by changing spi_alloc_master to devm_spi_alloc_master, and
removing spi_master_put in the error handling code.

Note that this patch can prevent UAF occurring any more

Fixes: fd8b5f502929 ("msi2500: move msi3101 out of staging and rename")
Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
---
 drivers/media/usb/msi2500/msi2500.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
index 71de6b4c4e4c..64c3ec9f1d0c 100644
--- a/drivers/media/usb/msi2500/msi2500.c
+++ b/drivers/media/usb/msi2500/msi2500.c
@@ -1220,7 +1220,7 @@ static int msi2500_probe(struct usb_interface *intf,
 	}
 
 	/* SPI master adapter */
-	master = spi_alloc_master(dev->dev, 0);
+	master = devm_spi_alloc_master(dev->dev, 0);
 	if (master == NULL) {
 		ret = -ENOMEM;
 		goto err_unregister_v4l2_dev;
@@ -1233,7 +1233,6 @@ static int msi2500_probe(struct usb_interface *intf,
 	spi_master_set_devdata(master, dev);
 	ret = spi_register_master(master);
 	if (ret) {
-		spi_master_put(master);
 		goto err_unregister_v4l2_dev;
 	}
 
-- 
2.25.1


             reply	other threads:[~2021-11-16 16:32 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-16 16:32 Dongliang Mu [this message]
2021-12-14 13:32 ` [PATCH] media: msi2500: fix UAF in the msi2500_disconnect Mauro Carvalho Chehab
2021-12-16  1:56   ` Dongliang Mu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211116163208.75879-1-mudongliangabcd@gmail.com \
    --to=mudongliangabcd@gmail.com \
    --cc=crope@iki.fi \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).