From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0051.outbound.protection.outlook.com [104.47.2.51]) by dpdk.org (Postfix) with ESMTP id 141E98E01 for ; Tue, 5 Jun 2018 02:13:48 +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=DKxp1oG7pqPqZF2+BRa6lxFY0/ZGDbIeHxnk5e3gxUNnQdgeojw0aeMA4oidsqxwEuNFxMC4O0Hwak5RKhOsr+MhkGRNn8T6Sv/R2fIi/ZBfWgjDUSxBl07HY5fWLY3t7CKTJatBvHCDkDZwugxTeuh4pEODgtucswJo/3XkJFg= Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) 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:13:45 +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:11:20 -0700 Message-Id: <20180605001129.13184-59-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605001129.13184-1-yskoh@mellanox.com> References: <20180605001129.13184-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO1PR15CA0060.namprd15.prod.outlook.com (2603:10b6:101:1f::28) To AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) 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:AM5PR0501MB2036; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 3:41zkeikC2ba/GC3fn00vfOtnKNB2q9BXxg6mXi7DvhlFsDCZsq2anJI0wCeFJ6hk0aOeUgIwYPRGP0Scp9ghqj97tB1qnTYuwbedNpPcTtOR6jfb5pgF/T5MOW5WRevhoQ+94m9YoPT3uVycu95vP19VgSvBwvUbB7bspj4WdA0irLE4FfKIfoGSHTaxu7FaghB01sEck+cGKnC1x2HlhLZLFRNoK7ON7yyud4pBpP8nKTwC699aHVE7iKWeVsx7; 25:iJ0b9aF5uyGAqGAqLZR9b9QnYbHskVZsML85jgOmOSZBAa5RSF/WR6ffB9oiVqZeCey0cWVv1MIl7GCRVAYndxeKlevMCnkVsRnioLtTvvdRoOPa3ErkWUuoC7sAeoJaIElhhZQQB9wTPP8l+5HmOwABhsityoW/6V7JASKVpuAbdVr2tk1pNZAMGkAbEeMFlgBcNkK5mRh1Pjn5AaKx7IzTeTqwQovPr279xmruhmt5pIHsf0lezU06Er0HFRgugBP4nssaIyaAQuKJ9sbotdHMtCul3pSUTDLCRyHRCTL7UHazJ2/EtqvcxUNz3rlOg3Bf++ImShWWKLmoy4QQ+A==; 31:4bAnKWX6wi05dZ5ZaHZlt3AAJzv3PgzJbzABRPOj3HhqiBO1GFJlhHOz+1EQH+Et3UelquPpISrfKE7l7iUrWx8jWiLAE4NSK7/bY9YEze5hEEZRWUmJCBJWbj5l91DHjyhVe9viYkApLL/CN9gl7H+ksZNDO/KrvK88RC1yZfkZUrx9hVpYS0m07VOHJ3xlB610Q12UxFFN9oHwwYP2KL+oY7VaMwyT39HdCrYo0oM= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2036: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 20:TC8XXThiQ1ZyWN3ws4N74ke+jomJSikJB+ZEtc9dFHLN/i6dD4VUBTI5i2o79C7g12W5q5RkhFirNW+vVGPJaL0oZvZn7go1y5yb6z/3pMG15K6MzHDbbBYY2BrKOw0S+VjFhumgBRq5x8Py/cMCrzuItDItVgBuf90MGqd9gyQo9JaEwpjyLLPu0t/Elp3SisM9oM/8CEFkN+nI1US7bI4JkPCAkmJQdYKocID8ghnu8hBJKFHpd4rizcJ7j2S9uiAnR2AaFW0K0AA/orlnhXs7hriAfD97mVbWKPR9QstJAjtKEsoqxP+KzyZtYN7LPaj+hwAy5IRGJC5mlFOCiShNzceSoK4owpzpgjjxwxadjK0E8aim0yfV8D5hn6dLDhX5zOtSprHwP//Kg/FXuWCeD7n42UsNAWf+nxtnt9kUs0XxW56zh0f0zEstFsGJ87qixf16b30zh2OZpUd2mXv3smV7Mf5jyibEVA9//wafxvY6ThkvTnfavoozqKCY; 4:WfXTI0AMlpIX0BzM3FGbMs12/AY3z5znACiLD9o6cLi/s+PSPlmlv8msKamEkfHpHiHPvK4z9fLfOy9YWe1krXsNG0Ll7rNqMeEYymg8zrYK9lkd7kyQ+bsJdVO/vQvRI3d/bn/YAVeyv4GAGbUClHgz5FbSVFlkUi5DLkAQMXwWPM+tYdShQzZFTZfISFDRjppj+2YHqIEL5fUp3LAgCkRTEr8SJpt9ZIWbq9bCxp8NO7b2/YmX9VrFVflLd23ICNDrFMjb+KMAADQkYalHSA== 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)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2036; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2036; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(366004)(396003)(39860400002)(346002)(376002)(189003)(199004)(478600001)(81156014)(76176011)(51416003)(7696005)(956004)(2361001)(50226002)(305945005)(2616005)(50466002)(47776003)(486006)(97736004)(5660300001)(6666003)(2351001)(106356001)(8936002)(186003)(81166006)(52116002)(6116002)(476003)(6916009)(386003)(446003)(11346002)(59450400001)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(575784001)(53936002)(107886003)(4326008)(2906002)(316002)(55016002)(36756003)(48376002)(105586002)(69596002)(68736007)(7736002)(16586007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2036; 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; AM5PR0501MB2036; 23:jRJdcN/+56p1g09QfKJUwSUcLkxt2oBASM7aCpO?= =?us-ascii?Q?Znn8XRBqhhVGSe5o9Ta+/ZJfqeloDZRkWd5Y7MG9FbfDBK1QL0btbsdXbkdx?= =?us-ascii?Q?XT/3hIKqiOaUa6KdpxWqvJ/ORF6HO9XqrzpIrggpqyT4pzHaq0LJr+LXSbDg?= =?us-ascii?Q?Nkh2BkKMAtt0FoC/DV1UoZhJrfZOvUjvvFGpJOQAWQZyPQ+CBsIK8a8wXH8N?= =?us-ascii?Q?ZoczweaS87eWJM6wC6f4CxkxOJUEgH5b34pB9vvT1SBIusovohB5h6jK9gOA?= =?us-ascii?Q?34kz+kXI9i2GoL6dIuLKNyNjCEAKkf734Ye55N4FAvRvx0bYHxJUIdRIXJdV?= =?us-ascii?Q?qfOViJyPJjgg6VNQvdsxSPmnzcaU0lGQzdkBDQmbNYMjSL0uEsx/4qCOtgDh?= =?us-ascii?Q?FopPDOzOlXRq2+tc8VrCx8wFLGeqzotXrCIv7NipJqIhllaIoXXap+ByIcEH?= =?us-ascii?Q?5NGH7ennvkjDqqJgKNWGJNXO9JMUMGbi2rnJGKc72Hf5zMF0QbmAwam/UgEt?= =?us-ascii?Q?FB4OdqyfWZytZOiaz3XOsYZCKwqEeLV7Wzoz7gE5rkLAtPr6b82NH2CkssCR?= =?us-ascii?Q?qyQpVjXrMZe3VY8l7HPVp0sSKFZXrRuo4vNmT7GJyXN/BhFp2zx1yE2+qPFM?= =?us-ascii?Q?+2/nUHFjy1z91pvUfePoDUIMeBS2v1Uix6GBJgJz73RoAwmrBNHcDdC/AVNC?= =?us-ascii?Q?4eydPD5o5tlC4knamNUWQhzieVozvbZkvZQout95IF0hUZ76HVY5rvoqhQ7L?= =?us-ascii?Q?ESzO5s0rc5bjcJJp169k6KYaC/ZN7rxw8IejFLvwD/q60qA+muSUz4APzzM4?= =?us-ascii?Q?y2sDMI6Nqdu9pkVj18IO10GpNrDp8ZdgXJiCi9k2UpO9E+4ZSa70ziHcm5+Z?= =?us-ascii?Q?CELCKLaqCiQP9k/yB0zmk/G7PZVuuNhJV73++pBhyYuITksO7VeLgOlz+kzf?= =?us-ascii?Q?YauAmbVkGjCGFZ7KspeXjctMCKODjGwtklDPozmcGVcj+L2+52bKrTFzmKV4?= =?us-ascii?Q?dYJhB4NbWv3YnA+61LbbOpbghA8yNXt0O/1Z1xNSLOJ3GMkIGNC0yFeCoUqz?= =?us-ascii?Q?hPLSjAiRGfZ/vHGTuZXgO+RdeSouOI+ee0Xw6SbKWfnmSLUloraN9XmIFdjK?= =?us-ascii?Q?RAwrsKcoALh7kvKhZGiEWf+HemoDm5ZhdMZK+wqHNv9VCqPQqR6VcsmyLoty?= =?us-ascii?Q?BASOnlZ0k7oDwdYUoH4Ad6bKQq3MQTelvKFtq1usITivBD1PTumQHHGe2b/r?= =?us-ascii?Q?G5WICL/oIkNsn7wyJjJoADpjSohEVQdVZmZtijoFSum9Nb7jlkLP2DkXavXP?= =?us-ascii?Q?Z6gdb05biGyiqqIyJGz8hydkL/234KhfClEZhCfJS4w37jF/gWGVHCzan5qB?= =?us-ascii?Q?1+5yqmw=3D=3D?= X-Microsoft-Antispam-Message-Info: i6ix2js1GyVz1Xi9vpX7c0BfII2Ff2YSV+Jrf8wWxE7GACqGm2gqYw0Gn1rcHHMvwlMc025ZUNAMUxAN6h+A3UQsoC3SEsM47IPyKaBGRD23YwD5Pd2hogLLCMblh6I4ONYESWzlH7EmdGoMtkE7sivUIVDzw1ZVi1xkhyxopEklaK1/adlQh5vSrvIfaLhz X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:VMJcLF4EoLB5sxKKEprL/cepACxHLoXr1+vO0mR/MYSVam2I00A2YFeey4G27R4tj7ApoIUbGOtPd+q/tZG+InbwHR0wZq78XRuKP5r/WneNKOu4vtKC8/pkqNAhKYf/uopLzcF+I4PIWLVLWhoY4Sdj097HWvtSSkuqqMcq514XumiamoTbMT8HKuzvDYaTNvJQLqSqJl5SsyCH+cAEb0Q93KTuzV62wJQZWYC0zyZfoDtiJdQBDl+OfWkFinL5rhmLXiJ8FLmGro65My18+3kBAd6gqrdBj4DxQKwN7lR2Ex0m92y+kNJZ3ikHelGmgBPDPDsB3j22ReKo88aFIsvZz/YviWZENaZmZRaJJkKMaHoOVPwgs9ykb5nWLh6p126G1MhUIo4eNLdXkS3RW4FVp0Ojwvba3DiHUcQCuuoQ9YFEdvHv4dr+e8i4HYuDJlx0b+DTgHu5jQnTTPOAHw==; 5:5T3tCklbFDdd4bonNms5EuuOGhgcgbMd3d5i2Q7x45q75NFmT5njPM0oX2hCcTUrsLtxNrTSLOZeGiGxkA70ioeNGqEsh/0wPvl2aAkiCi3em5D/9+P2U3EQzvDb9WZoGZYT8JzreM95ygsn4SKGpHKPNf0lr3POnOrTs+DJkrM=; 24:y1oe/kMicOHPtyG31AtmUQpf7fgWXEHAcgrEGvMxHnqQzvMz0OMbfsV1K7UP4mxf/PKc9rFRlG7OugMA9xSwg6X6Bagn7dGmZC77K55h/KI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:h1ngZy8lM9ekko6wY6HTo0AaPO+4zXF1jeFFKYI2ISY62Eju8xFE2Y3V4jSx2CcJhSZVvf+8rThp8CrV5uueulyAEis+IqVD/In1LRVrPSwpsbSWk//hkwmiZsFLOGBfMXKRkcDtebWKgI/I1C88r1nz6AeSnY++2E4PQsemPjsKPumqV++uNTLicXaeqru46tSp737boCm9mo7YSEmhQXfaFZJheNtPj0jXgqWiUSHsKWz4BjOTYGHb5omnfeuz X-MS-Office365-Filtering-Correlation-Id: 1c80db6f-83f8-45bd-94f7-08d5ca7934e8 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:13:45.4834 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c80db6f-83f8-45bd-94f7-08d5ca7934e8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2036 Subject: [dpdk-stable] [PATCH 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:13:48 -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