linux-block.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: axboe@kernel.dk, linux-block@vger.kernel.org,
	linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com,
	"James E.J. Bottomley" <jejb@linux.ibm.com>,
	"Martin K. Petersen" <martin.petersen@oracle.com>,
	linux-scsi@vger.kernel.org,
	syzbot+f08c77040fa163a75a46@syzkaller.appspotmail.com
Subject: Re: [PATCH] scsi: sd: Jump to out_free_index if device_add{,_disk}() fail
Date: Tue, 29 Mar 2022 10:28:24 +0200	[thread overview]
Message-ID: <824276213.0ifERbkFSE@leap> (raw)
In-Reply-To: <20220329075752.GS12805@kadam>

On marted? 29 marzo 2022 09:57:53 CEST Dan Carpenter wrote:
> On Tue, Mar 29, 2022 at 10:47:45AM +0300, Dan Carpenter wrote:
> > No, this patch is wrong.  That is supposed to be freed in scsi_disk_release()
> > but apparently that's not getting called.  Is the ref counting off?
> > 
> 
> Yeah.  The device_add() needs a matching device_del().
> 
> regards,
> dan carpenter
> 
Thanks, Dan.

I've just just checked other similar code and saw the following pattern 
whenever we have an error:

device_del(dev);
put_device(dev);

Therefore, I suppose that you are suggesting the following simple change:

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a390679cf458..13d96d0f9dde 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3474,6 +3474,7 @@ static int sd_probe(struct device *dev)
 
        error = device_add_disk(dev, gd, NULL);
        if (error) {
+               device_del(&sdkp->disk_dev);
                put_device(&sdkp->disk_dev);
                goto out;
        }

Did I get it?

Regards,

Fabio



  reply	other threads:[~2022-03-29  8:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-28  8:44 [PATCH] scsi: sd: Jump to out_free_index if device_add{,_disk}() fail Fabio M. De Francesco
2022-03-28 14:38 ` Dan Carpenter
2022-03-29  6:18   ` Fabio M. De Francesco
2022-03-29  7:04     ` Christoph Hellwig
2022-03-29  7:47     ` Dan Carpenter
2022-03-29  7:57       ` Dan Carpenter
2022-03-29  8:28         ` Fabio M. De Francesco [this message]
2022-03-29  9:08           ` Dan Carpenter

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=824276213.0ifERbkFSE@leap \
    --to=fmdefrancesco@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=dan.carpenter@oracle.com \
    --cc=jejb@linux.ibm.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=syzbot+f08c77040fa163a75a46@syzkaller.appspotmail.com \
    --cc=syzkaller-bugs@googlegroups.com \
    /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).