From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 084A811C5 for ; Tue, 14 Jul 2015 15:11:07 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 14 Jul 2015 06:11:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,471,1432623600"; d="scan'208";a="746888358" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 14 Jul 2015 06:11:05 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t6EDB4PW023870; Tue, 14 Jul 2015 14:11:04 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t6EDB4JU018800; Tue, 14 Jul 2015 14:11:04 +0100 Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id t6EDB4RK018796; Tue, 14 Jul 2015 14:11:04 +0100 From: Bernard Iremonger To: dev@dpdk.org Date: Tue, 14 Jul 2015 14:10:56 +0100 Message-Id: <1436879459-18400-3-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1436879459-18400-1-git-send-email-bernard.iremonger@intel.com> References: <1436879459-18400-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH 2/5] virtio: check vq parameter in virtqueue_detatch_unused() function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jul 2015 13:11:08 -0000 If vq is NULL, there is a segmentation fault. Signed-off-by: Bernard Iremonger --- drivers/net/virtio/virtqueue.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c index 8a3005f..7f60e3e 100644 --- a/drivers/net/virtio/virtqueue.c +++ b/drivers/net/virtio/virtqueue.c @@ -1,7 +1,7 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -60,11 +60,13 @@ virtqueue_detatch_unused(struct virtqueue *vq) struct rte_mbuf *cookie; int idx; - for (idx = 0; idx < vq->vq_nentries; idx++) { - if ((cookie = vq->vq_descx[idx].cookie) != NULL) { - vq->vq_descx[idx].cookie = NULL; - return cookie; + if (vq != NULL) + for (idx = 0; idx < vq->vq_nentries; idx++) { + cookie = vq->vq_descx[idx].cookie; + if (cookie != NULL) { + vq->vq_descx[idx].cookie = NULL; + return cookie; + } } - } return NULL; } -- 1.9.1