lkml.org 
[lkml]   [2013]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/6] VMCI: Fix deref before NULL-check of queuepair ptr
Date
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


\
 
 \ /
  Last update: 2013-01-11 01:01    [W:0.038 / U:0.836 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site