From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, viro@zeniv.linux.org.uk, bvanassche@acm.org,
gregkh@linuxfoundation.org, rostedt@goodmis.org,
mingo@redhat.com, jack@suse.cz, ming.lei@redhat.com,
nstange@suse.de, akpm@linux-foundation.org
Cc: mhocko@suse.com, yukuai3@huawei.com, linux-block@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v2 10/10] block: put_device() if device_add() fails
Date: Sun, 19 Apr 2020 19:45:29 +0000 [thread overview]
Message-ID: <20200419194529.4872-11-mcgrof@kernel.org> (raw)
In-Reply-To: <20200419194529.4872-1-mcgrof@kernel.org>
Through code inspection I've found that we don't put_device() if
device_add() fails, and this must be done to decrement its refcount.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
block/genhd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/genhd.c b/block/genhd.c
index 06b642b23a07..c52095a74792 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -721,8 +721,10 @@ static void register_disk(struct device *parent, struct gendisk *disk,
WARN_ON(ddev->groups);
ddev->groups = groups;
}
- if (device_add(ddev))
+ if (device_add(ddev)) {
+ put_device(ddev);
return;
+ }
if (!sysfs_deprecated) {
err = sysfs_create_link(block_depr, &ddev->kobj,
kobject_name(&ddev->kobj));
--
2.25.1
next prev parent reply other threads:[~2020-04-19 19:45 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-19 19:45 [PATCH v2 00/10] block: fix blktrace debugfs use after free Luis Chamberlain
2020-04-19 19:45 ` [PATCH v2 01/10] block: move main block debugfs initialization to its own file Luis Chamberlain
2020-04-19 21:06 ` Bart Van Assche
2020-04-19 19:45 ` [PATCH v2 02/10] blktrace: move blktrace debugfs creation to helper function Luis Chamberlain
2020-04-19 21:11 ` Bart Van Assche
2020-04-22 7:12 ` Christoph Hellwig
2020-04-19 19:45 ` [PATCH v2 03/10] blktrace: fix debugfs use after free Luis Chamberlain
2020-04-19 21:55 ` Bart Van Assche
2020-04-20 0:04 ` Luis Chamberlain
2020-04-20 0:38 ` Bart Van Assche
2020-04-20 18:46 ` Luis Chamberlain
2020-04-20 20:16 ` Greg KH
2020-04-20 20:41 ` Luis Chamberlain
2020-04-21 7:00 ` Greg KH
2020-04-22 7:28 ` Luis Chamberlain
2020-04-22 9:43 ` Ming Lei
2020-04-22 10:31 ` Luis Chamberlain
2020-04-24 23:47 ` Luis Chamberlain
2020-04-22 7:29 ` Christoph Hellwig
2020-04-22 7:34 ` Luis Chamberlain
2020-04-22 7:27 ` Christoph Hellwig
2020-04-22 7:48 ` Luis Chamberlain
2020-04-22 8:10 ` Christoph Hellwig
2020-04-22 8:26 ` Luis Chamberlain
2020-04-19 19:45 ` [PATCH v2 04/10] block: revert back to synchronous request_queue removal Luis Chamberlain
2020-04-19 22:23 ` Bart Van Assche
2020-04-20 18:59 ` Luis Chamberlain
2020-04-20 21:11 ` Bart Van Assche
2020-04-20 21:51 ` Luis Chamberlain
2020-04-19 19:45 ` [PATCH v2 05/10] blktrace: upgrade warns to BUG_ON() on unexpected circmunstances Luis Chamberlain
2020-04-19 22:50 ` Bart Van Assche
2020-04-19 23:07 ` Luis Chamberlain
2020-04-20 23:20 ` Steven Rostedt
2020-04-19 19:45 ` [PATCH v2 06/10] blk-debugfs: upgrade warns to BUG_ON() if directory is already found Luis Chamberlain
2020-04-20 11:36 ` Greg KH
2020-04-19 19:45 ` [PATCH v2 07/10] blktrace: move debugfs file creation to its own function Luis Chamberlain
2020-04-19 22:55 ` Bart Van Assche
2020-04-20 11:37 ` Greg KH
2020-04-19 19:45 ` [PATCH v2 08/10] blktrace: add checks for created debugfs files on setup Luis Chamberlain
2020-04-19 22:57 ` Bart Van Assche
2020-04-19 23:05 ` Luis Chamberlain
2020-04-19 23:17 ` Bart Van Assche
2020-04-20 11:40 ` Greg KH
2020-04-20 18:44 ` Luis Chamberlain
2020-04-20 20:11 ` Greg KH
2020-04-20 20:20 ` Luis Chamberlain
2020-04-21 6:55 ` Greg KH
2020-04-20 11:39 ` Greg KH
2020-04-19 19:45 ` [PATCH v2 09/10] block: panic if block debugfs dir is not created Luis Chamberlain
2020-04-19 23:08 ` Bart Van Assche
2020-04-20 11:38 ` Greg KH
2020-04-19 19:45 ` Luis Chamberlain [this message]
2020-04-19 23:40 ` [PATCH v2 10/10] block: put_device() if device_add() fails Bart Van Assche
2020-04-24 22:32 ` Luis Chamberlain
2020-04-25 1:58 ` Bart Van Assche
2020-04-25 2:12 ` Luis Chamberlain
2020-04-19 19:48 ` [PATCH v2 00/10] block: fix blktrace debugfs use after free Luis Chamberlain
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=20200419194529.4872-11-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=gregkh@linuxfoundation.org \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=ming.lei@redhat.com \
--cc=mingo@redhat.com \
--cc=nstange@suse.de \
--cc=rostedt@goodmis.org \
--cc=viro@zeniv.linux.org.uk \
--cc=yukuai3@huawei.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).