public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dtor@vmware.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Randy Dunlap <rdunlap@infradead.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-kernel@vger.kernel.org, pv-drivers@vmware.com
Subject: [PATCH 3/6] VMCI: Fix deref before NULL-check of queuepair ptr
Date: Thu, 10 Jan 2013 15:41:40 -0800	[thread overview]
Message-ID: <1357861303-25903-3-git-send-email-dtor@vmware.com> (raw)
In-Reply-To: <1357861303-25903-1-git-send-email-dtor@vmware.com>

From: Andy King <acking@vmware.com>

Check for a valid queuepair ptr before trying to lock the queuepair (which will
deref it).

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andy King <acking@vmware.com>
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---
 drivers/misc/vmw_vmci/vmci_queue_pair.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmci/vmci_queue_pair.c
index da47e45..6417a26 100644
--- a/drivers/misc/vmw_vmci/vmci_queue_pair.c
+++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c
@@ -3355,11 +3355,11 @@ ssize_t vmci_qpair_dequev(struct vmci_qp *qpair,
 {
 	ssize_t result;
 
-	qp_lock(qpair);
-
 	if (!qpair || !iov)
 		return VMCI_ERROR_INVALID_ARGS;
 
+	qp_lock(qpair);
+
 	do {
 		result = qp_dequeue_locked(qpair->produce_q,
 					   qpair->consume_q,
-- 
1.7.4.1


  parent reply	other threads:[~2013-01-10 23:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-10 23:41 [PATCH 1/6] VMCI: Add PCI as a dependency Dmitry Torokhov
2013-01-10 23:41 ` [PATCH 2/6] VMCI: Remove dependency on BLOCK I/O Dmitry Torokhov
2013-01-10 23:41 ` Dmitry Torokhov [this message]
2013-01-10 23:41 ` [PATCH 4/6] VMCI: Fix "always true condition" Dmitry Torokhov
2013-01-10 23:41 ` [PATCH 5/6] VMCI: rename PPNset to ppn_set to avoid camel case Dmitry Torokhov
2013-01-10 23:41 ` [PATCH 6/6] VMCI: include slab.h into files using kmalloc/kfree Dmitry Torokhov

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=1357861303-25903-3-git-send-email-dtor@vmware.com \
    --to=dtor@vmware.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pv-drivers@vmware.com \
    --cc=rdunlap@infradead.org \
    --cc=sfr@canb.auug.org.au \
    /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