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 14850A04EF; Sun, 31 May 2020 13:26:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3EA6A1D40B; Sun, 31 May 2020 13:26:38 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80081.outbound.protection.outlook.com [40.107.8.81]) by dpdk.org (Postfix) with ESMTP id AC0771D3F0; Sun, 31 May 2020 13:26:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KnYvRWSYww3P7Gk9TjZaY3+0KJ4Xp8fP4mWemKIMKHkEZE5YxFCiHn7yXCIT59MjtaKQSgjUPL2ddzA/dqtDPnJSu2VDpUkNc9DEvS8IVS89K0hsNfkMh24XzW1OTf2WdC5K4q2d+kBpAuoMR6RSnVPkT50eljdsIwI1kkwTAAwejsq6Wn9baD+/N4AUYukDVq18CI1k0Fo/b0ZNGPi/Fqd7n7o0elkHEsBI7vKcf8CI5dkC7VTBJQf/dNQPtns8YQ8l9fD0zrwBUJUXJlXotTyyVdtXCMwunoMzxKnr5jaQNafPXxHMlgyMK4AH1BoNVm8B5ChYnwPgIVbdJFDOdA== 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=JP8zAr42zqOE19tKnYVIPHoiXqXh0d1tzmRvCVuDDik=; b=ILNi882IPn92mnUACFzFXpBp1qWKbSCqgHzg7fGw6JFWc+0m5cFkToXxoWcWW48eM7cCLTzlsZQr5bFTd8qM6hkAGdkfRvzTqmH+Y/DHPctCAU+Dta2qqJk9p/K8/okaxPww3hzZVKvo2ZPB9XnBfYtu1FYmv8K41t0aBGC8SLSzCJFbg7nv3XxREgtaANbwgm3OJqbzHhKP74Ti8yTxReYyBjTyU+ublFtaW2q0bfgZA4Kwqq39G52xdYSywHT2DHbuJBM9qKKyYIH5Gu+A8OkntwLCyDW53YkwTV5IujVLjTAn6KT1BSdUfQYdGa5O4SLcsIkLS54E4flMmeP4OA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none 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=JP8zAr42zqOE19tKnYVIPHoiXqXh0d1tzmRvCVuDDik=; b=fwVAnd/tqjs84xuQSjqm9mXhvGFaOmK0vsUZcFTpMjzMCEyFYy7e1I5CFbN6nXroLiGrKvWZRhESQIK+4vaWa8qct0LQ8eMdeIWbUvLqi/InUYXSjgqSsXmXHjEbibx7GNhZIPfcfA2W35AIdZPxYiExsddSHuU0e3mBMF4kWtk= Received: from AM0PR05MB6707.eurprd05.prod.outlook.com (2603:10a6:20b:15b::17) by AM0PR05MB5299.eurprd05.prod.outlook.com (2603:10a6:208:ed::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.17; Sun, 31 May 2020 11:26:32 +0000 Received: from AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::508:747b:cc12:5f6e]) by AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::508:747b:cc12:5f6e%7]) with mapi id 15.20.3045.024; Sun, 31 May 2020 11:26:32 +0000 From: Raslan Darawsheh To: Michael Baum , "dev@dpdk.org" CC: Matan Azrad , Slava Ovsiienko , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH 1/6] net/mlx5: fix hairpin Tx queue creation error flow Thread-Index: AQHWNAJFAV9GuhZwvkq8jcpl1OEuwqjCFFyA Date: Sun, 31 May 2020 11:26:32 +0000 Message-ID: References: <1590568677-11662-1-git-send-email-michaelba@mellanox.com> In-Reply-To: <1590568677-11662-1-git-send-email-michaelba@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: mellanox.com; dkim=none (message not signed) header.d=none;mellanox.com; dmarc=none action=none header.from=mellanox.com; x-originating-ip: [84.242.49.134] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 98d45ce1-faa7-48ec-e571-08d8055578aa x-ms-traffictypediagnostic: AM0PR05MB5299: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 0420213CCD x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rxpnMMd/CljTHgRbg8euArJvvuHlRVpoVE1f8hCT4W3lUcPHfXnsmp1G3ri/Cou5i4mw/Ra98EM5uFyqkaE6u8oARYBVd+F0M9DEf+UEmnFhLw/khbAFIDbf9XIleRCCFu4VY8FhNEfRKaD5ODDt/0hE4Hip3AA7jLVul56aUqUe1q7ed1/SR5rQkwhgSWGH6/Cz53CFOLYUOm9erL7lyJrYOUF04MzThFyVhkeC6Tsf3ll3b1AlsCa2srQ0UEDErKPn6NTSsL9JwF8rOGWawHTUf1nS+aNCH98mMOkcmYZt6YwiXrpgUfVUa29/DuMAEG3o17G+dNHr5em3rbK4hQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR05MB6707.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(136003)(39860400002)(366004)(376002)(346002)(396003)(71200400001)(8936002)(186003)(450100002)(7696005)(66946007)(52536014)(86362001)(76116006)(33656002)(5660300002)(53546011)(66556008)(66476007)(83380400001)(6506007)(2906002)(9686003)(66446008)(64756008)(110136005)(316002)(55016002)(478600001)(54906003)(26005)(4326008); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: IzsMLE3HBbMcVXJFss/EgIsjEFrFA9a7vhAm0u3Z7qGnMSfBmjHLkA7iEDU9M8kDjMbQnPkOxYJd9CVQ1f4MEqouk2rdKDWTPtlWqj7nAhoSGdmL/y19dHh74vN8cqlxsxUz3wq6PX4Qn1o1zkJa2dmkBQ6rweJEFx9mesK0P0rTQfDCihXPA7sqXJL3SaQL0UoVqjNeo7HMbwOmQlza5OAm8hLOM0KfejC3CiVsP4L78IGq+DifItggzxLKrLra0lCQH603K0JvjbrJP7O4n2MldaqiqLFABV7I0Yi8F0RkGo3nUfxUxvMpQF1uZtEwf0UJXbpJAIgRsNwOCz3owS9+Fcx37Mk4oimpKtIHEOOyvF+vM8Pi0F31FgYO08EX5CFaaV7d0rINr06UJXHcT17C2bV5hZChu9GMc6740TBbi+3pWU1ygjQbM60dl9Yn/GoMKxLUsMNZ+ob/KDXFN8L2cQN3BGncfs41c0cIuTg= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98d45ce1-faa7-48ec-e571-08d8055578aa X-MS-Exchange-CrossTenant-originalarrivaltime: 31 May 2020 11:26:32.6395 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: R2RgHYot9ED5iCASPbIzeJm47v+0uAuzKfiiMsq2c/UjIqSKcJQLVFKTEUJFQ/4H+DKfCRH24DF0T05+RL9Plg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5299 Subject: Re: [dpdk-dev] [PATCH 1/6] net/mlx5: fix hairpin Tx queue creation error flow 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" Hi, > -----Original Message----- > From: dev On Behalf Of Michael Baum > Sent: Wednesday, May 27, 2020 11:38 AM > To: dev@dpdk.org > Cc: Matan Azrad ; Slava Ovsiienko > ; stable@dpdk.org > Subject: [dpdk-dev] [PATCH 1/6] net/mlx5: fix hairpin Tx queue creation > error flow >=20 > The mlx5_txq_obj_hairpin_new function defines a pointer named tmpl and > allocates memory for it using the rte_zmalloc_socket function. > Later, this function allocates memory to a variable inside tmpl using > the mlx5_devx_cmd_create_sq function. >=20 > In both cases, if the allocation fails, the code jumps to the error > label and frees allocated resources. However, in the first jump there > are still no resources to free and the jump only for the line return > NULL is unnecessary. Even worse, when it jumps to error label with > invalid tmpl it actually does dereference to a null pointer. > In contrast, the second jump needs to free the tmpl variable but the > function instead of freeing, tries to free the variable that it just > failed to allocate, and another variable that has never been allocated. > In addition, for another error, the function returns NULL without > freeing the tmpl variable before, causing a memory leak. >=20 > Delete the error label and replace each jump with local return NULL and > free tmpl variable if needed. >=20 > Fixes: ae18a1ae9692 ("net/mlx5: support Tx hairpin queues") > Cc: stable@dpdk.org >=20 > Signed-off-by: Michael Baum > Acked-by: Matan Azrad > --- > drivers/net/mlx5/mlx5_txq.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) >=20 Series applied to next-net-mlx, Kindest regards, Raslan Darawsheh