From patchwork Mon Aug 6 18:11:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 43603 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9EA6B1B3A1; Mon, 6 Aug 2018 20:11:21 +0200 (CEST) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by dpdk.org (Postfix) with ESMTP id 4F9441B1F7 for ; Mon, 6 Aug 2018 20:11:19 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id r5-v6so6589390pgv.0 for ; Mon, 06 Aug 2018 11:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IA44RVPqzTYLOSCtL+qBxYJ8EV3O8XFxS2ICujXmL0U=; b=jFDErUR4fdFaocoIkGVYiJndfxT25h2KdSaxiVUVLSKdZMQbz4MUYaA5w5aGGoV/hR LO25x4Tw9WIi03MdFqJ9iuG5yh6WN2Tj5kSSChXLeis0IsknrihzJ/CheMLtz+ifCMDE ZdCxCvmjACRCwC5Yq90lvyGkuVqxo+utzZi4CdiA1eeW3NtfL+SkRs4cuIAPVxD6PW+S bWQuyxm7rq0VKLvZIZSVFp5WGsDpA1QeWxKIRki4b3wzpZ1m3BGpjMcPvIT6MIGSnI9Q 5j555wI/5FAqfozJ4pRUMTSh96bDlmCvE296grIsJ7ZBWgJJ8uPnZxylJvvKb+cHyBoo yYzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IA44RVPqzTYLOSCtL+qBxYJ8EV3O8XFxS2ICujXmL0U=; b=gOadF4CYg3zAVC6gphBjp33WqadMLbNoz5WngGQP8i6MQcV7pKF8xV1w0Klb3phAEy iV+HJ+XjPa9G6m7wYpZJ0ybv3tOEIjiJ9qaMYdoDoNUiCQwvBzHTgtuUA8Eyt+CgFb6p 0LltnrKWf30Ca46yu/p8Ga0k3wpl366+byKCHNyWuyL1qJWPvmayGkv4/T2wRiqEgbwQ 4bMMDGiD15olPLuaB+cuocvgSMQJyRG5cgLqDHdMHBFanEtK1Z9b6Xsols8PoOwGlK+8 6/MPRfgPZdZVyRC4HsAOK8FjUWqEMYupWMkF8bHLGmbjFiaqM2CbLGPBP0Nt9iPfkPhe LfDQ== X-Gm-Message-State: AOUpUlHK7eqeZRiCY8ctKeSaLuHdllVXLaMVnEKjNnli5ed9q4D0szXJ W4cLH8bJOMkW/CKqM4cRimbod3R7/vU= X-Google-Smtp-Source: AAOMgpc52PG6ilG34vuvfhVvZ2jGX/iLAxy50jL4Ae4c7cDFKdifHOvSEuG1timlPxHI3h+u/kNuCA== X-Received: by 2002:a63:a619:: with SMTP id t25-v6mr15295704pge.288.1533579078166; Mon, 06 Aug 2018 11:11:18 -0700 (PDT) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id q78-v6sm23388130pfi.185.2018.08.06.11.11.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 11:11:17 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Stephen Hemminger Date: Mon, 6 Aug 2018 11:11:06 -0700 Message-Id: <20180806181108.5913-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180806181108.5913-1-stephen@networkplumber.org> References: <20180806181108.5913-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 1/3] vmbus: close directory in error path X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fix bug reported by Coverity where directory being scanned was not closed in error path (leaking file descriptor). Coverity issue: 302848 Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Signed-off-by: Stephen Hemminger --- drivers/bus/vmbus/linux/vmbus_uio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c index b0f8ebaea6ea..0b1b153cc017 100644 --- a/drivers/bus/vmbus/linux/vmbus_uio.c +++ b/drivers/bus/vmbus/linux/vmbus_uio.c @@ -357,6 +357,7 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary, if (err) { VMBUS_LOG(NOTICE, "invalid subchannel id %lu", subid); + closedir(chan_dir); return err; } From patchwork Mon Aug 6 18:11:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 43604 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 656E31B3AB; Mon, 6 Aug 2018 20:11:23 +0200 (CEST) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by dpdk.org (Postfix) with ESMTP id B9E9C1B293 for ; Mon, 6 Aug 2018 20:11:20 +0200 (CEST) Received: by mail-pf1-f194.google.com with SMTP id j8-v6so7246918pff.6 for ; Mon, 06 Aug 2018 11:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lBUECSWqx3BIgUUyg5d7VkYSdQ2BDwHmGQR4DhdxbHU=; b=c0/ntOKnBFzaPyYWYTsrp29B+B0dal9HAxdo/cxA+DQSZYV/Chaslt5gjZqWrm9UAs CcfiHqYnmMYBzTyIsa7YEMvcuWXetNwv8vuVHO+MkSBOsndec8TQJliQNKX2lKMLq4od +3Ya5Ch1Ku10sZIkoECFlkzNqE4WzKMo4xY/gc1F+VA4grO5Pg8jXbnLX/8QfselAxHg IQxKyIxw0UAQ+9manflVVfbjevxu6XlDNyZOFiKHIWfosqmqzp6oZllP2LZp1/nngzTC +wTKFvmSnJP1MD8IKZZz+xkRDZuMgDg+VxZIZgVl0O+DQzPGI2d00kTFbhwc6wt29qxD Hfww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lBUECSWqx3BIgUUyg5d7VkYSdQ2BDwHmGQR4DhdxbHU=; b=Ttpm/c7i5EqzdNySh5grEEskyCuhUwiswnNQ5vfqP3P7IPIwdJj+fNOLh+Y24l2j9Q aFMF7mvt8loomkqPRSxH/NlMpGfHmdKDaJZo2d6mXl5d97KU13jGQHYZyYvqLn04z9YM P/Ofwzof1JZQ928Qnj/x9v5a6/KbXfaDJvMvD43YbRE7NvY4QATWhvV5qyE6h0VIuGrR sHjm6inLvSdImLPt5NKx2H9c+ahvE4uXBF+sUUKNck2hWTkztRJJkttVPqKAD6z5DArz IU6C6CJpCENuB202I66PqrDWYc0qnxUARk3iWNA1/wlZ62VfTmTVWw4sZXypyB3JRU85 NgJA== X-Gm-Message-State: AOUpUlGjbvhVKBHs926gdE19PeUzSfESJXMyZHzrLp/VkO4b9BGR6xUG f5WQwWoMau2yGL4wkUzAtqOoXX5/c2c= X-Google-Smtp-Source: AAOMgpeYpIInZ2bSs44BwXFzuEGvKnO+WkGMv1HtmTepRiaLzx1iSHfLZ4I/bUpIqbFrbFBlf9iCZw== X-Received: by 2002:a63:fe02:: with SMTP id p2-v6mr15556233pgh.148.1533579079510; Mon, 06 Aug 2018 11:11:19 -0700 (PDT) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id q78-v6sm23388130pfi.185.2018.08.06.11.11.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 11:11:18 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Stephen Hemminger Date: Mon, 6 Aug 2018 11:11:07 -0700 Message-Id: <20180806181108.5913-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180806181108.5913-1-stephen@networkplumber.org> References: <20180806181108.5913-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 2/3] vmbus: make sure path is null terminated X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use strlcpy rather than strncpy to avoid any issues about null termination. Coverity issue 302859 Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Signed-off-by: Stephen Hemminger --- drivers/bus/vmbus/linux/vmbus_uio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c index 0b1b153cc017..bc2c6235e6bc 100644 --- a/drivers/bus/vmbus/linux/vmbus_uio.c +++ b/drivers/bus/vmbus/linux/vmbus_uio.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "private.h" @@ -89,7 +90,7 @@ vmbus_uio_alloc_resource(struct rte_vmbus_device *dev, goto error; } - strncpy((*uio_res)->path, devname, PATH_MAX); + strlcpy((*uio_res)->path, devname, PATH_MAX); rte_uuid_copy((*uio_res)->id, dev->device_id); return 0; From patchwork Mon Aug 6 18:11:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 43605 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D80E21B42F; Mon, 6 Aug 2018 20:11:24 +0200 (CEST) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by dpdk.org (Postfix) with ESMTP id 15BD31B3A9 for ; Mon, 6 Aug 2018 20:11:21 +0200 (CEST) Received: by mail-pg1-f195.google.com with SMTP id k3-v6so6578856pgq.5 for ; Mon, 06 Aug 2018 11:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Z2CtOy6KdQkaZanqPqxStSpV8o3G43Rg43XLi2pvEZc=; b=XWsxoqSkLCCcAz+NCve/zlTskXwR9ZSgxsqWJ0RNuESDLL7EcfR2nLi5WQ7vjXHU+Y oVv7oRDuqDeUVtvVBvX5InvRQ92YxiyTNTaY5ESr0eRSFdP5W5FE84IHXwrog+4qQ86D MSKc8AFOMA13jgNcqc/EY/BTO21q5KIRw79nmnx9+8OgF3tcxzwaSRBHjQbx5bg4nQ2C nPiWueszZRRFLWbY+fbtHSgm/jDXMGUj13w+J1muhXVS5wkkmM5EQF9jaoz+3Y06RhUK mRRwn2MI4zkXG4kTsH4GgrfOmupk+qhPJ3TOHPJFO4+ClKR8Hzgy/TB++LFfYr+tDs6/ BF2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Z2CtOy6KdQkaZanqPqxStSpV8o3G43Rg43XLi2pvEZc=; b=t44iq5hFylqnhTwNOgIm/puQOvxiHiKxVGT8cyE3NP8oOVkaUhiZm2ApXpFpKti1Hz Ax88YOwpL2NCUEg4MyKAlhYTwSlOJ8I71MnYkMhxY8v3KDrqvYABfLe62Yxwxww8QYPy KaKSIyX4qiO4YXyuhT3K3qoITLSlcpECl/19qUXDzAPQaF1PAmrj84fzI62cvMRxtSsw Tbv9cuI5+uLc6C0MaGToIULSncgGtXH7rHNrHsJbup8513bZgNjO0qIP0JFYJ3bO08TD pGYoyCh+TlAUPMFTQtq4kP3iCtVNqFSssaYW/j4sippKfy2G5oAzm4vPRyFNh6zcbKtv AKag== X-Gm-Message-State: AOUpUlG7Il+cJIUEVrklMkxtxvA47nXG3UEBWIaL41ESzp1Q7+YpiixS vl56hpSaIc2XQT7Ex+zLSQmS3sQSjEM= X-Google-Smtp-Source: AAOMgpefQwtV5Go8bem2bY2ZBYg6SZwiXQ/F59aC/Gp0S77ZfKqRc33Y4TdPNcukzhPcEXL058aGXg== X-Received: by 2002:a65:58c8:: with SMTP id e8-v6mr15261766pgu.96.1533579080818; Mon, 06 Aug 2018 11:11:20 -0700 (PDT) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id q78-v6sm23388130pfi.185.2018.08.06.11.11.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 11:11:19 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Stephen Hemminger Date: Mon, 6 Aug 2018 11:11:08 -0700 Message-Id: <20180806181108.5913-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180806181108.5913-1-stephen@networkplumber.org> References: <20180806181108.5913-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 3/3] vmbus: handle eof on irq read X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This function is not used by netvsc driver yet. Still the code should handle case where device driver returns zero (due to rescind). Coverity issue: 302871 Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Signed-off-by: Stephen Hemminger --- drivers/bus/vmbus/linux/vmbus_uio.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c index bc2c6235e6bc..856c6d66785d 100644 --- a/drivers/bus/vmbus/linux/vmbus_uio.c +++ b/drivers/bus/vmbus/linux/vmbus_uio.c @@ -39,11 +39,17 @@ void vmbus_uio_irq_control(struct rte_vmbus_device *dev, int32_t onoff) int vmbus_uio_irq_read(struct rte_vmbus_device *dev) { int32_t count; - - if (read(dev->intr_handle.fd, &count, sizeof(count)) < 0) { - VMBUS_LOG(ERR, "cannot read to %d:%s", - dev->intr_handle.fd, strerror(errno)); - count = -errno; + int cc; + + cc = read(dev->intr_handle.fd, &count, sizeof(count)); + if (cc < (int)sizeof(count)) { + if (cc < 0) { + VMBUS_LOG(ERR, "IRQ read failed %s", + strerror(errno)); + return -errno; + } + VMBUS_LOG(ERR, "can't read IRQ count"); + return -EINVAL; } return count;