linux-rdma.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bart Van Assche <bvanassche-HInyCGIudOg@public.gmane.org>
To: Roland Dreier <roland-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: Alex Chiang <achiang-VXdhtT5mjnY@public.gmane.org>,
	linux-rdma <linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: [PATCH 1/3] IB/umad: Remove container_of() != NULL tests
Date: Mon, 12 May 2014 11:17:42 +0200	[thread overview]
Message-ID: <537091B6.5000007@acm.org> (raw)
In-Reply-To: <53708666.6060209-HInyCGIudOg@public.gmane.org>

container_of() never returns NULL. Hence remove the code that tests
whether container_of() returns NULL.

Signed-off-by: Bart Van Assche <bvanassche-HInyCGIudOg@public.gmane.org>
Cc: Alex Chiang <achiang-VXdhtT5mjnY@public.gmane.org>
Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
---
 drivers/infiniband/core/user_mad.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index f0d588f..e61287c 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -783,10 +783,7 @@ static int ib_umad_open(struct inode *inode, struct file *filp)
 	int ret;
  	port = container_of(inode->i_cdev, struct ib_umad_port, cdev);
-	if (port)
-		kref_get(&port->umad_dev->ref);
-	else
-		return -ENXIO;
+	kref_get(&port->umad_dev->ref);
  	mutex_lock(&port->file_mutex);
 @@ -880,10 +877,7 @@ static int ib_umad_sm_open(struct inode *inode, struct file *filp)
 	int ret;
  	port = container_of(inode->i_cdev, struct ib_umad_port, sm_cdev);
-	if (port)
-		kref_get(&port->umad_dev->ref);
-	else
-		return -ENXIO;
+	kref_get(&port->umad_dev->ref);
  	if (filp->f_flags & O_NONBLOCK) {
 		if (down_trylock(&port->sm_sem)) {
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

      parent reply	other threads:[~2014-05-12  9:17 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-12  8:29 [PATCH 0/3] Fix a use-after-free in ib_umad Bart Van Assche
     [not found] ` <53708666.6060209-HInyCGIudOg@public.gmane.org>
2014-05-12  8:30   ` [PATCH 1/3] IB/umad: Remove container_of() != NULL tests Bart Van Assche
     [not found]     ` <5370869F.5040103-HInyCGIudOg@public.gmane.org>
2014-05-12 10:04       ` Yann Droneaud
     [not found]         ` <1399889097.3017.1.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2014-05-12 10:36           ` Bart Van Assche
     [not found]             ` <5370A41F.8050001-HInyCGIudOg@public.gmane.org>
2014-05-12 12:40               ` Yann Droneaud
2014-05-12  8:30   ` [PATCH 2/3] IB/umad: Fix error handling Bart Van Assche
     [not found]     ` <537086BA.3020807-HInyCGIudOg@public.gmane.org>
2014-05-12 10:18       ` Yann Droneaud
     [not found]         ` <1399889890.3017.6.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2014-05-12 10:32           ` Bart Van Assche
     [not found]             ` <5370A323.5000504-HInyCGIudOg@public.gmane.org>
2014-05-12 12:35               ` Yann Droneaud
2014-05-16 11:03         ` [PATCH v3 0/2] Fix a use-after-free in ib_umad Bart Van Assche
     [not found]           ` <5375F094.30809-HInyCGIudOg@public.gmane.org>
2014-05-16 11:04             ` [PATCH v3 1/2] IB/umad: Fix error handling Bart Van Assche
     [not found]               ` <5375F0CD.5080809-HInyCGIudOg@public.gmane.org>
2014-05-20  8:33                 ` [PATCH v3.1] " Yann Droneaud
     [not found]                   ` <1400574821-9562-1-git-send-email-ydroneaud-RlY5vtjFyJ3QT0dZR+AlfA@public.gmane.org>
2014-05-20 11:25                     ` Bart Van Assche
     [not found]                       ` <537B3BBE.4040202-HInyCGIudOg@public.gmane.org>
2014-05-20 11:39                         ` Yann Droneaud
2014-05-16 11:05             ` [PATCH v3 2/2] IB/umad: Fix a use-after-free Bart Van Assche
     [not found]               ` <5375F108.20608-HInyCGIudOg@public.gmane.org>
2014-05-16 12:28                 ` Yann Droneaud
2014-06-06 16:25                   ` [RESEND PATCH] " Yann Droneaud
     [not found]                     ` <1402071904-25003-1-git-send-email-ydroneaud-RlY5vtjFyJ3QT0dZR+AlfA@public.gmane.org>
2014-06-06 18:39                       ` Roland Dreier
2014-05-12  8:31   ` [PATCH 3/3] " Bart Van Assche
2014-05-12  9:17   ` Bart Van Assche [this message]

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=537091B6.5000007@acm.org \
    --to=bvanassche-hinycgiudog@public.gmane.org \
    --cc=achiang-VXdhtT5mjnY@public.gmane.org \
    --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=roland-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.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).