From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4058DA09D2 for ; Wed, 11 Nov 2020 07:14:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 06DF6F64; Wed, 11 Nov 2020 07:14:09 +0100 (CET) Received: from hqnvemgate26.nvidia.com (hqnvemgate26.nvidia.com [216.228.121.65]) by dpdk.org (Postfix) with ESMTP id F09CFF64; Wed, 11 Nov 2020 07:14:05 +0100 (CET) Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Tue, 10 Nov 2020 22:14:07 -0800 Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 11 Nov 2020 06:14:01 +0000 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.105) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Wed, 11 Nov 2020 06:14:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q/OMac+8PYUc+E39OOzoCUrFjqbG9C2NdNaQhUorzJ3IZ/cf7Zh9wCcG5A2v9t/ZMu2tco2AKZzaa2+Qp/L66Tt7tx57p30ZPFmrMVhNsdxhHDSIDF7uRYPSew15MDp2TF9+Yx2CcJ5AQA/0EJt+hxqcuLtf/KfiTeH31yaiQQcdag+yImRg8x4RTU8Sz3NvwDO8P7wf7Fam4n/4RD8eD9Hf+NnCgJQMu4eRGedxZmiEBA4kenU0h5BQhiT2W3YSlJ3WEpABbMAe1P6HfOmcXayu350Lux3gWzWLL2emeS4iQ5+zi4YpEnuAszVLI2CVMGePe977ZCQSes/h28JY9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wMNtaxTJrjg91Mel5P+YbFKLML9YxLaEKk7KqCa4ywo=; b=a0mMG+htoOaw0/StwDqJkVUZTen08HSQMXpjTqQu3i5HrnvRzc/Z893Fzztgg1nrX4NeRGfNvqCNV4/A6xzsPDaFkXXh4N5V0WbGL8ftXdeFoCOODXemw4nP5K6/q0jY31f6vqypBQJ+w73m7RxK0pCwvdnzr6cz0dHFGdIZKTELGfhD0uoYsR79W4/PtziTH8P5gW5JEOGqcQFut2O43GQSoVNM+91EczyxUb6yMsRNbhv3pSeF0rgBQQWgWVmHX3auga3ur/39oce9b38BUv1NLBDamC3glgjb15WEfWucJ4WeEYaQj5WUvk/+a2Kp4Ai7neVruCBH1kinS5Gatg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none Received: from BY5PR12MB4324.namprd12.prod.outlook.com (2603:10b6:a03:209::10) by BYAPR12MB2933.namprd12.prod.outlook.com (2603:10b6:a03:138::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.23; Wed, 11 Nov 2020 06:13:59 +0000 Received: from BY5PR12MB4324.namprd12.prod.outlook.com ([fe80::3420:8913:2256:fa6f]) by BY5PR12MB4324.namprd12.prod.outlook.com ([fe80::3420:8913:2256:fa6f%2]) with mapi id 15.20.3541.025; Wed, 11 Nov 2020 06:13:59 +0000 From: "Xueming(Steven) Li" To: Maxime Coquelin , "dev@dpdk.org" , "xuan.ding@intel.com" , "stephen@networkplumber.org" , "NBU-Contact-Thomas Monjalon" , "stable@dpdk.org" , "chenbo.xia@intel.com" CC: "Xueming(Steven) Li" Thread-Topic: [dpdk-dev] [PATCH v3 2/3] vhost: fix fd leak in dirty logging setup Thread-Index: AQHWtpKDzkFo+PNBB0G502Sau6QbRqnCdkHg Date: Wed, 11 Nov 2020 06:13:59 +0000 Message-ID: References: <20201109121630.251603-1-maxime.coquelin@redhat.com> <20201109121630.251603-3-maxime.coquelin@redhat.com> In-Reply-To: <20201109121630.251603-3-maxime.coquelin@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=nvidia.com; x-originating-ip: [240e:46c:b580:11b6:1873:8290:65b9:2693] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 71b0bf2f-8db2-4707-d4b1-08d88608fadd x-ms-traffictypediagnostic: BYAPR12MB2933: x-ld-processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:483; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: D3bWQBzP2g1FM3I2bSUNUNYqll56dfD08TmbkBuB4QR2IoQtWsqg3d+b+4VDZacTQIvBPocTkR9LMXWWE8ECaCbKjxAuWONANEl13Oh+DHkQKTVjG8Aq2jAmG7EQ4psAtGEW7fenOq0htTMaxRkbdlRYwwFDfD1rn8n5PRV812W+SOVcLcoABZXs0798MtSRFJ9/+xsslrSZ5XRW8Ik3/NKZqbio5ZHgLLWWs/LeB39Q2sB0C2wYIK7RLIrvI58GQg0vmPIAQhdRXpXIkSMYD7rAHuJUxDAyJZFlYomG6Pr9X29+DhiilKCTxEq74cSJ7JZ1VIxOadzftKcHECzQTkedTpXa5tQGuD82i8a56xNuAhpaY4U933/DP+euXLaa x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR12MB4324.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(136003)(39860400002)(346002)(376002)(396003)(2906002)(66946007)(5660300002)(478600001)(33656002)(110136005)(66556008)(52536014)(4326008)(8936002)(7696005)(186003)(86362001)(8676002)(64756008)(6506007)(66446008)(76116006)(107886003)(9686003)(55016002)(66476007)(83380400001)(71200400001)(316002)(14143004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: 1fetzM0PssqdCDvVYGduKu7gcaKFPBbDgwap2a9erPraFWRRQFKtUTgtJZuu4l7QUDYKNq49+Bw3clgIB1VS+DNyH1Ngkt6i9QY94nsKABRUwRqgVLmoNb2mMYrwDCAHDCQevdzER51lsQ4pS1omsR40gemCC+Fz3jflcpkBrdF79iwz8IXMe8rB8e4QeIFbiwJB5xgFnPKfXtnJvfkj1NKtQLVUn9rpP4o3sa9g9FKm7uRxQRtSWetERRklFxwIoDpfjQSxtCQtujGHiiXTeyJ2Hv2gTRNN0MI/vYy1SHyKlmyJvSbGQEysWejIZPjdjLschOJGzo4i0613SbT/v9+PdfcjkZiD09IzYpNZIsQqu2/Ea5hDngDWp5r1OZkW8y3ipVW29ingtwkDsNUoAz6rPuvx/9NVBzzdWX+HwTAFAfsz20c6iqi6ZRaj4LzN0Jx3grUYBZgF9ZYyYzc8Ndkld/sAY18be69/rOIJsVD63M8pSfwhI4/ef/Vni/AObfwsV0w7wI8RtllhLIsdtEDPkxy73t46jB1/4lrH1eT2WZX5iSUzMZWsx+ARh4TJS+/Z06cwQ9Hbu0NGLeu1BA9P/wv8Mk5KPKghFLbAgIXDMCb7jtSApM7EXJRQ8R9V13mpPRKyF3oetwP0qBsbqldzTqlSnhdcTuX+tjUb/G9g4yE/7xcatd7374d/3Zkk/apZSu1Tnbzg6MV47zcQpQ== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4324.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71b0bf2f-8db2-4707-d4b1-08d88608fadd X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Nov 2020 06:13:59.9139 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: FAIptTwPLJ5wR+4nfzgdC/nDhj4Q+qtI69YSycblFd/5qfAqeuBSgJeS684aYmf7fXu6eIJ+4wl8LI0lO+utPQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2933 X-OriginatorOrg: Nvidia.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1605075247; bh=wMNtaxTJrjg91Mel5P+YbFKLML9YxLaEKk7KqCa4ywo=; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To: CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References: In-Reply-To:Accept-Language:Content-Language:X-MS-Has-Attach: X-MS-TNEF-Correlator:authentication-results:x-originating-ip: x-ms-publictraffictype:x-ms-office365-filtering-correlation-id: x-ms-traffictypediagnostic:x-ld-processed: x-ms-exchange-transport-forked:x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers:x-ms-exchange-senderadcheck: x-microsoft-antispam:x-microsoft-antispam-message-info: x-forefront-antispam-report:x-ms-exchange-antispam-messagedata: Content-Type:Content-Transfer-Encoding:MIME-Version: X-MS-Exchange-CrossTenant-AuthAs: X-MS-Exchange-CrossTenant-AuthSource: X-MS-Exchange-CrossTenant-Network-Message-Id: X-MS-Exchange-CrossTenant-originalarrivaltime: X-MS-Exchange-CrossTenant-fromentityheader: X-MS-Exchange-CrossTenant-id:X-MS-Exchange-CrossTenant-mailboxtype: X-MS-Exchange-CrossTenant-userprincipalname: X-MS-Exchange-Transport-CrossTenantHeadersStamped:X-OriginatorOrg; b=A6gLxQnMzlvmkRJXn6qffwk/gceI6lrbwPNlkzu91tdT8VKXPHSF2zY9WOVS/XMBM k0VcOa6oBS5NU1TS1xB7fa2oTeJwc4n3yYrKJNUtgVar49oMwQFiHrLzI2K4kcUW6g sPNbIl6VZwRcNdzTuPmJkkk/eEmX2XCvc8s3yX6xhBHQCg6sdgY6KTlBwQr50ghQH8 ZgWWr70RaEbtqsUK5pHh6J6jeKK35wBYEOTuSXZnkjvmtXpAh2VCgwWYMkjX3hd5ni ZPsOeIGD81Ouh9sTdR4dvF9nq8f23aWYfozekLTpBHC6d1kVG9d73P7jG5sdiKSQ3W y1E4EHXKSaXdA== Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v3 2/3] vhost: fix fd leak in dirty logging setup X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" >-----Original Message----- >From: dev On Behalf Of Maxime Coquelin >Sent: Monday, November 9, 2020 8:16 PM >To: dev@dpdk.org; xuan.ding@intel.com; stephen@networkplumber.org; >NBU-Contact-Thomas Monjalon ; stable@dpdk.org; >chenbo.xia@intel.com >Cc: Maxime Coquelin >Subject: [dpdk-dev] [PATCH v3 2/3] vhost: fix fd leak in dirty logging set= up > >This patch fixes a file descriptor leak which happens in the error path of >vhost_user_set_log_base(). > >Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") >Cc: stable@dpdk.org > >Reported-by: Xuan Ding >Signed-off-by: Maxime Coquelin >--- > lib/librte_vhost/vhost_user.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > >diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c= index >473fd778ca..94b066f0b9 100644 >--- a/lib/librte_vhost/vhost_user.c >+++ b/lib/librte_vhost/vhost_user.c >@@ -2083,7 +2083,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, >struct VhostUserMsg *msg, > VHOST_LOG_CONFIG(ERR, > "invalid log base msg size: %"PRId32" !=3D %d\n", > msg->size, (int)sizeof(VhostUserLog)); >- return RTE_VHOST_MSG_RESULT_ERR; >+ goto close_msg_fds; > } > > size =3D msg->payload.log.mmap_size; >@@ -2094,7 +2094,7 @@ vhost_user_set_log_base(struct virtio_net **pdev, >struct VhostUserMsg *msg, > VHOST_LOG_CONFIG(ERR, > "log offset %#"PRIx64" and log size %#"PRIx64" >overflow\n", > off, size); >- return RTE_VHOST_MSG_RESULT_ERR; >+ goto close_msg_fds; > } > > VHOST_LOG_CONFIG(INFO, >@@ -2131,6 +2131,10 @@ vhost_user_set_log_base(struct virtio_net **pdev, >struct VhostUserMsg *msg, > msg->fd_num =3D 0; > > return RTE_VHOST_MSG_RESULT_REPLY; >+ >+close_msg_fds: >+ close_msg_fds(msg); >+ return RTE_VHOST_MSG_RESULT_ERR; > } > > static int vhost_user_set_log_fd(struct virtio_net **pdev __rte_unused, >-- >2.26.2 Reviewed-by: Xueming(Steven) Li