From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30077.outbound.protection.outlook.com [40.107.3.77]) by dpdk.org (Postfix) with ESMTP id 7B556CFA0 for ; Tue, 5 Jun 2018 02:41:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JxoxgghjzLLRdYLBjv6VDl8/fvu/lj2KCD2PkMztoCI=; b=KtvqOhfIQmWQQIo4hzuvIoC5J/Na8giHSb0qVQR8PQ/9jcxw+BqObcQuIPkXelvaI9vaF+9QC05fN/epJcISXLO+vRdvxsk8tCcmJEsAurzz3cknk2rKRPhKj0Fk5uKr3ogG9Qngp9sv017b7HqP2Uwn7zJAiJ/TO5LrD6Rwmag= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by VI1PR0501MB2045.eurprd05.prod.outlook.com (2603:10a6:800:36::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:41:17 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com, Raslan Darawsheh Date: Mon, 4 Jun 2018 17:40:28 -0700 Message-Id: <20180605004029.14593-9-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605004029.14593-1-yskoh@mellanox.com> References: <20180605002732.13866-1-yskoh@mellanox.com> <20180605004029.14593-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: BYAPR07CA0013.namprd07.prod.outlook.com (2603:10b6:a02:bc::26) To VI1PR0501MB2045.eurprd05.prod.outlook.com (2603:10a6:800:36::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0501MB2045; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 3:3z2Uj2FBa/ULEzjCo3uOhatemHO879Mgi2d4eFOdVFgpC9VNy532IEgMnP6FWTKNeFnA1PFaEsdez04zTe/ad/4ns5mbpJ6pvoQqoJblu38W7nsvsaC0YaWriD/DRGFrsEmnYTSyrhfedlkot36jWaWig21xQ23PSQjmEALXYDUKGR2ykrLoJoA38p5bgzNJDQQjAB9q7NlzILz3P6J1XVhxj8/y+6NAyUaXRD7CBBKpvb2omhsg4V7ZTT4ag14B; 25:ixl4IubQOIAeu/fICw4q2npNbXRRq4WIJRBDwhgI9ZhWjPr5oElhaXhzNpePdIebR34ixEzEKCtVuRB1Xj9ndMhaoCcdAEZC8wDDvIisyqvAT3Q3xV7U8rQiqAgXNso1fgK0hbtGa1wpbHsE4d2Rq7R2+njKhGIgq6VKeQ8ki5gnLtpXYuf3nWC+79ee+a6G3GalZIKlrXIxjnnZFBkNDPEWrc6DOKv88xb6z+MXqXxwr/IihCsHxWfUYaZSuiWTclM1GjfSV0rPU74nn46EgY6+drQoXK1NgIE8Pcak15xAo6Njl+MXuutjUwkjxGCj2DU11yCKXggah7/P8jCIsg==; 31:jYbhdR/GUGRPHw7QSnG3Y0NeY+oKeLwMlG/lB+C1Mmm5z7BWHviSRiHNSDGEH1gvFlmtD/obNisVueZ9aeNU8Oo+LQQiB7jFQqBr4B6Eu+Ism3DqMm4Sp8Pmvd+gmyAw9VeIW3wDxcIFGZg5B89gLstmPTEBsTExhYT3VGsvOYf4M9tBcbNCYaa62S9UtMjuTm1STfE+FE3F1zEyBQDwRrStFSy1XAV9ECtSih3XhUk= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2045: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 20:H9D5zawrB/GrB4VML3nmjDER0maBbiROJaxO2o1bUaRGH1lJbSU3jcoSVCZqcIl5h7YMTl/0ksennXF0xqGZDO79RgCMnAWQtdufBn1e3mkoEbqqW7xZ9z7P6fRr7/nh2MORDso2/lCPiiITQ67hTip8KaOt78zg2WwU8xw2hZsFytHtBFijbd2x/AutOemm2t3MDJxrLXp5LhG805Y8teP8jS4liQLf4qRm5YHibBKhVLzK+sd32TLp+yQdBHZvvXDVuWvfGSm0r8PGQ7oNDfNMpQq7uvVrXTdbWpQdexu9SutYJjxTedMWbFAnaeuf0YR7WT4X+dGs+bwzGiYKVfOkQzdzRn9gSOgOZOlIlodS+pL7rHMH8w+/Z/daUcpPIyMAq0Lx4nRFoqJeh1j2yKwGGuzSfrVPEIjKd/1TclQQneH5T+v+aMiUTCfqNJ0Oib6rAEbRvmm/JOVLyQZ8u/f03xRr3K+UkfsGcjtw9MfxFSQfmnwALfH/mXTWnltK; 4:xFuB+MzI5eUCmSMw4UxDmR1Y3tLGFtfROfPKi/V7FmCKsMVisSYeEoTk90KeTGbsP/jecJIQAmOc0U5v7qegt9LACy8njkLpssiem2baL7FqouJieGjzX3qGCB0/4rdbsNb2oZwcVbw5xgBd4/qrKwElM1eGNmCc6IulyLmxHmn7ZF56k6/GVShpq5N/FLOGPrhhu4Ta+eMhfQNQ5ophLFT522Y9JOVeoyeYyv6HtPSceVS3xemuorrHCxBBkErGuOgmsCKyrmyMIUfmorSZZw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR0501MB2045; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0501MB2045; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(366004)(39380400002)(376002)(396003)(189003)(199004)(5660300001)(8936002)(3846002)(6116002)(6666003)(2351001)(55016002)(97736004)(7736002)(305945005)(8676002)(48376002)(68736007)(2361001)(6916009)(2906002)(575784001)(86362001)(81166006)(81156014)(1076002)(50466002)(53936002)(47776003)(446003)(16586007)(36756003)(105586002)(2616005)(486006)(316002)(956004)(51416003)(69596002)(52116002)(7696005)(11346002)(386003)(476003)(59450400001)(50226002)(478600001)(66066001)(4326008)(107886003)(186003)(21086003)(25786009)(106356001)(76176011)(16526019)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2045; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0501MB2045; 23:CBm0qJTqP1DvckBloJmD0lSVRBzPdZ5Pmi+Bnkm?= =?us-ascii?Q?HEvtnGnNTfYi+vyBSGlX2lKC0rZWug5fglmnYT4Ejwl345+JSMPtIY539wlS?= =?us-ascii?Q?AfA9K6SddWqoAOxKX2l7DFv6RsHk42u5iCEEB9Nr+nPvQZIGcOlWR6MG9xVb?= =?us-ascii?Q?IV/cLvXAc3CERhuVbpvJVXXOzhkDAhKMzDE0Fn8HMSq1QR0HwvImAURopMD1?= =?us-ascii?Q?6To1kl6vafN5cXZuZYwRIlJF9e+7V2sQfw8+nrqvKlc09XQyFYWYMVx7cCx0?= =?us-ascii?Q?JP4UO6mhturL7GI9bJAThsRMG/8MAuyVpgpniNzC+FgvaGJZ43vR5xmf2cpr?= =?us-ascii?Q?NwvEEqheP7oaLFfIhBLMNIVH1j9pZ69tv5mDOQEdlI8PYx3FsMMW4ffy311S?= =?us-ascii?Q?4JZm28H5oss22Cj/OQX8oYq3gtmzhAa1QXZPsafgfqzbVuRXYVSnpbn2UidG?= =?us-ascii?Q?HVm5GAgelWhPHLVNHdQX7MqJjBeXWwwZZNHpjHS4uCw4rOBonDwUktpSM3KI?= =?us-ascii?Q?3CO8Ewe/pjbtsybwkUidOkpCHjEOhTlwAaxPkzsNnjVN0po1HpTqcSYVAhdL?= =?us-ascii?Q?zpuPh66LlmjrHiwpeMLF/TKIiHZZWZSfCCmknrXGfN68dADJJJMPWf3k0ynr?= =?us-ascii?Q?D2Dw/e4FMtwrik34k9mnfGJZSQmNec9iiSDzSNBEFxKwCj8dMBsKlksTeZ2W?= =?us-ascii?Q?Xk/yufm17XUJiLOdSEfL0i+ph/7cSMkg0IClnueLncjT9BcAHiT+6bfhSTLt?= =?us-ascii?Q?PBUjLXBsudsrMxDXpBLW1zQi2wI5806u2X6spfzZbz6EhgKetVkw3C+HEqF+?= =?us-ascii?Q?e210IJv9eMsd9oTFY5JJLEvIBPPcT3KCrxSh7/25qzahaIoxjqi4TZB0Sr1P?= =?us-ascii?Q?4BNeaNfQSu0lZsFFa6eknhZK6pun1guDtXBSOmiE112k4cY1vdjz5Ruo3+sM?= =?us-ascii?Q?EROrullqR3y8T82PfRvf5UHHy6vMULphwhKvdPyd4kEulPgspHnHvqc/v5Sc?= =?us-ascii?Q?0WqEqYI9Nshhm6i6oLEwODn9pSXFlo8tw+wiDEpmEaxLQCesPhwwYqF+Q7YE?= =?us-ascii?Q?pRDpnVOy3NgJEYqCVuUU0elRt0pKGMkz4ZQufakJHWTWVv0A8A0ZZz7zmG3R?= =?us-ascii?Q?1CimuxIow/KYnjIZ4POyaei5A5ALi9w56wTxKhiTRKpRI5L7KmChajnOyrFo?= =?us-ascii?Q?9k6t8a8ZAFakfp+fXDHWZmyMj63uxGSIO+xgYSB5Q0xOHuXpVBKPXCB9GOfU?= =?us-ascii?Q?0+XUSDQSFTXkSzkC9iSScxl55i0qgKDQDdbuBIe6JORTwow75zET2kSQ6HmI?= =?us-ascii?Q?fZ+CfeCEj3my5hjww75JgMocKIHb1MRjJFByK2IprhE0K?= X-Microsoft-Antispam-Message-Info: V45BPAiHZsrKfNC2jpyaIW1/7I1CkjCl1UvgdT0jjhykG/SykO/P/IwP/gqRzArz9DrchRyKrTt/54VawQ9UOveAz0UawA/DC94aTrqS+dT9JtH7MpFBrRdkZ4FLvTwzCugy0sRjWKXAMNmGI3tsyTCNpOr5GXxEuhcDmy7d2+Ou+K7DlXxLNaq7zrmyBsgw X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 6:zkUsFg0goUxsCCB1XfGbB5j4Vz6sKrSnF5y+p/NmiRzuRfjyYj/6SK6pV+n+4P5fnWPuNj+owu+WQ46cGwFdQNGpnxfAr/sDaTKROMNTn3+UYNGkg0t8vBHewhRosrgBXSF5bbfqNo6UUe8DUxX7wGvFKKOiRe0XDpgSoFDK2dWMkxPlOnUES4ROb25KRbHhmsFvmypLgylpvUfGUZ1c+frW3gCQ4FYVND+ZDf/8GlqHsxidRxizGyxHtw+QBOqMn2t8VKGma3d8QOQLChibxkgoLXTt0sceziiZvyhorUqfQv/ijaC2RGyW2Qifyq9A5ey260srJOtnR6grgKjZ+D2nGKdb4JLBoHPF8a5YyOzN4UAMLlKBlILE1CnQuTWkx0PTYoXnpictJ9plrpMeAME22j62JlCKE57F5slialbfKHowmpYpqrd/+jHdzBGPhKAw8+ClLJENq9ql0E/BJw==; 5:z1bRgWFTaM9iHgnXqb9nDjfBAQrYSlbv7u78AEoNP+zR9GFa3a3LL9FGhhGJIU+ykEW3WEcvX5/murAG6X+ufwKWlsWRV0Wha84TLSn1CdAXRt2LY/oXK7BR1LhjDFy9zvaRN4FZzeE4mJoPB9n4lxKSDqWVdv/AL2WwZQ9E7gI=; 24:gzZz8I6c8A6KTL5H+l4gFZe5Pl8YdRWEfjiKV1hVdVtZaMogte3byW0E8wiEK54xOAmDI1sfmXjs82uv0YPiky27km/6b7MRIiAtHyHnzsw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 7:t6xzsGN1lMd+6j8eBukkOxjh4gzi/tc9AtHbZP4fr8zgHy8pV5YOu9kFbkITbayT6vHk+NvhbWAmvpCa+9lZIhQCm2tBCy4SBxn0houQDBCT+jMP1m3qFeoEY3DedI3eTxes2n2jo1A7J3l/zZfcGLe/XWykYNTISO2EssXRUhhBlL7RIbtrU1WfCjgxBK/NBDQaflZzgjyW9tNLDEfw0o1S915VsN3cMTTXADKM70akAN79TggYtddb0Qyz5K3x X-MS-Office365-Filtering-Correlation-Id: 053a6006-aa5f-4370-b582-08d5ca7d0d9e X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:41:17.6332 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 053a6006-aa5f-4370-b582-08d5ca7d0d9e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2045 Subject: [dpdk-stable] [PATCH v2 58/67] net/mlx5: fix double free on error handling 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: , X-List-Received-Date: Tue, 05 Jun 2018 00:41:20 -0000 From: Raslan Darawsheh [ backported from upstream commit e9f4166014cb7abf8c74b913ff046487d0e7bea2 ] When attr_ctx is NULL it will attempt to free the list of devices twice. Avoid double freeing the list by directly going to error handling. Fixes: 771fa900b73a ("mlx5: introduce new driver for Mellanox ConnectX-4 adapters") Cc: stable@dpdk.org Signed-off-by: Raslan Darawsheh Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index bd21454cb..ef17ec9a1 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -742,18 +742,18 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, break; } if (attr_ctx == NULL) { - ibv_free_device_list(list); switch (err) { case 0: DRV_LOG(ERR, "cannot access device, is mlx5_ib loaded?"); err = ENODEV; - goto error; + break; case EINVAL: DRV_LOG(ERR, "cannot use device, are drivers up to date?"); - goto error; + break; } + goto error; } ibv_dev = list[i]; DRV_LOG(DEBUG, "device opened"); -- 2.11.0