From: Douglas Gilbert <dgilbert@interlog.com>
To: linux-scsi@vger.kernel.org
Cc: martin.petersen@oracle.com, jejb@linux.vnet.ibm.com,
hare@suse.de, dan.carpenter@oracle.com, colin.king@canonical.com
Subject: [PATCH v2 2/6] sg: sg_remove_sfp_usercontext: remove NULL check
Date: Wed, 17 Mar 2021 11:27:54 -0400 [thread overview]
Message-ID: <20210317152758.51689-3-dgilbert@interlog.com> (raw)
In-Reply-To: <20210317152758.51689-1-dgilbert@interlog.com>
The NULL check on sdp is useless as it has already been
de-referenced. sg_fd object without valid parent pointer
(sdp) should never occur.
Reported-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
---
drivers/scsi/sg.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 7d4a0fd9ee32..77fec70b7c2f 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -3918,10 +3918,8 @@ sg_remove_sfp_usercontext(struct work_struct *work)
o_count, sfp);
kfree(sfp);
- if (sdp) {
- scsi_device_put(sdp->device);
- kref_put(&sdp->d_ref, sg_device_destroy);
- }
+ scsi_device_put(sdp->device);
+ kref_put(&sdp->d_ref, sg_device_destroy);
module_put(THIS_MODULE);
}
--
2.25.1
next prev parent reply other threads:[~2021-03-17 15:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 15:27 [PATCH v2 0/6] sg: fixes for 5.13/scsi-staging Douglas Gilbert
2021-03-17 15:27 ` [PATCH v2 1/6] sg: sg_rq_map_kern: fix uninitialized Douglas Gilbert
2021-03-17 15:27 ` Douglas Gilbert [this message]
2021-03-17 15:27 ` [PATCH v2 3/6] sg: sg_rq_end_io: set SG_FRQ_ISSUED Douglas Gilbert
2021-03-17 15:27 ` [PATCH v2 4/6] sg: fix double free of long scsi commands Douglas Gilbert
2021-03-17 15:27 ` [PATCH v2 5/6] sg: tighten handling of struct request objects Douglas Gilbert
2021-03-17 15:27 ` [PATCH v2 6/6] sg: remove debugging remnants Douglas Gilbert
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=20210317152758.51689-3-dgilbert@interlog.com \
--to=dgilbert@interlog.com \
--cc=colin.king@canonical.com \
--cc=dan.carpenter@oracle.com \
--cc=hare@suse.de \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.