From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-901460-1516769638-2-8797550117212429382 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516769638; b=PMt1VMSQCWnix44pSVjVrdJw7p5t2Wr22d9CqqA35kGXz/X s7WO8CgskyOBxFUmSzOQv+J4sQvakWc+caE1ExP/uzPs97jvgZ55k/Becg7Cyz2f j3Y567bKm5Ykdd7vUtFUajLhD8IV62JTdBkpEzhYwD3K0v7VdPYAJ/k9r2dXGUVa YVws1XY5O+8d0NEMOLgBg+2pwKHHemmU9wJsbHw6bDF3NW31K0TCMa7YS5l9RLd1 IX+cDa2clmbfnGaHMX+JCHtQ+JCetRUK/tZzAXpiCMj70lnQEMJjsEaAuZtnbUys +ZXC+ZwepVsy7CNG6XuqzjWHaYlU68g6d6llT7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516769638; bh=Cu2b3m xjqHbiHfP9A1Nv1RXnLazXH8/q2rkHAB4QuTg=; b=u2qAgRQFd940iCgupHcYX3 chW2LQisJ2dlX0bc/FN0UkXMiFEzFCPW0Y+mzupylP5aEOnfPQKNj3d/LfTnuUB2 9wfCPhleeTdTsllkfiCT+sSJh3ZHEtOB8FLHcm/XA3+7ZM/0yMPoodtfAJOAfQG2 Ud2mFB7kEp9gC+mQAVBqgFOtU5A6IJ4kvs1r2Huu3Qo7laALm3+pjNqtAKkcNjkc IcjEL0MaplvCzXHYezpqHFY7olAV83fgFT48w6QpQzDwwBmJqCcl5+sovbS4iTWs MV8LiHlpTh3scVJIzj1H4owgYWYOhoGP1IhOcuzvi+G85Vh0+6CwaZnW3vKDf+GA == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=jlg2Isb7 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=jlg2Isb7 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932438AbeAXExM (ORCPT ); Tue, 23 Jan 2018 23:53:12 -0500 Received: from mail-sn1nam01on0120.outbound.protection.outlook.com ([104.47.32.120]:45079 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932433AbeAXEP7 (ORCPT ); Tue, 23 Jan 2018 23:15:59 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Antoine Tenart , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 065/100] net: mvpp2: fix the txq_init error path Thread-Topic: [PATCH AUTOSEL for 4.14 065/100] net: mvpp2: fix the txq_init error path Thread-Index: AQHTlMnlcqyBSe9NBUC1B7B4HY46UA== Date: Wed, 24 Jan 2018 04:14:58 +0000 Message-ID: <20180124041414.32065-65-alexander.levin@microsoft.com> References: <20180124041414.32065-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041414.32065-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1015;6:4GjnPVBLSMmGZ/QfHBtw+eP4/J2vfqVgOpBz1JcPSeZPY98pACoBQ7j0qXfXUSZ1NdwKlVJ5ctJKcZkOnDRQlBygeXP9HEheBIekjsEPh0Vsp5A7XdhvCUcVvax/GmOMtok4uG6cH5XIEJ2SutjVV2TxAzUaQNcXabLFBCr40580rCqh5nxNhPvXJqCtPCyst90KydjBfIAgRtc+vmN9mKLqVHqW3VdTZZX2iAxd08U0YpyKSEEQEKrdfg8ER5REqEF1ezgtHhB+pPVBMs5Z6OUTqbhjbN2c7a8EvzLNu6kCiTBtOIZCh0wC9kr2DQNra+XjDJNN+Q3X6wBEXxyuuLCGW6hf7o0bjv//VQ0UVk8Y+KTiLMej8JikSJjOtNVz;5:uwsHJvHBk9Pj3juoSgKFR6qIbJPcZw0Tj8lyenmJWz9us+oNw6mrnFPr3YcNEMTlhrRe66pzQxuDRyJg8KYrUmCEWaDVoInCo19tWVAT2dHU36u2c+a16Dj+hnvfGlBEFUc/n9lyVUvbxfmDhVP42N+gCgluBFdxQ5d+LlaWfZg=;24:UHIsLUa3MOBXrTpc05AJyVDHJULqCK7udPmJtZdMvd2qlmuj/qs4Be2UDgtXGEtKZwJBN+E7huxxtY4EuTP4L1ABFzagqRZrKN3EjlqTrew=;7:0T5hIJy1RFD/ljMyq2T8Kf0nXGMUKf/4Qxx2JD6b49YW3kialXjYePnxDiI7oaiRpLif3OKNQIBC/Nv2huOhO+0QWUQr9g7YaqwAX7NJ5eBZwvzGWXc+pYLw5ANndrrXLcaHuD/EQbV7FVzklQjPyn3Kt8ox5Ik5ud2hKLc2qGTVOHXISwwYzwqnLVcmtbB/UxzK/XmRfLXKMwkXeiOF72koEeFdnWc/SZWIR8+nBBYeDHqXjaQNYaCHOMrXqjwD x-ms-office365-filtering-correlation-id: bae3cfda-a942-417f-7d3b-08d562e1298a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1015; x-ms-traffictypediagnostic: DM5PR2101MB1015: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(58145275503218); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231046)(2400081)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1015;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1015; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(376002)(366004)(39860400002)(346002)(199004)(189003)(478600001)(106356001)(6512007)(53936002)(2900100001)(36756003)(102836004)(2950100002)(2501003)(10290500003)(97736004)(14454004)(81166006)(72206003)(8936002)(6486002)(1076002)(10090500001)(6346003)(26005)(54906003)(4326008)(575784001)(76176011)(99286004)(86362001)(3660700001)(105586002)(6116002)(8676002)(68736007)(22452003)(66066001)(25786009)(6506007)(5660300001)(305945005)(7736002)(3280700002)(5250100002)(2906002)(107886003)(86612001)(6436002)(316002)(81156014)(3846002)(110136005)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1015;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: 4i5dGnGc6YVq6syYFkLA8sA1D1Mb+f6g7E73pC8aYbge7TDJFwUFmsZUNjb1VvSl2LPG5d5KvKByl7uc3/m1oA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: bae3cfda-a942-417f-7d3b-08d562e1298a X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:58.0496 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1015 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Antoine Tenart [ Upstream commit ba2d8d887d962c2f790e6dc01b2fd25b4608720b ] When an allocation in the txq_init path fails, the allocated buffers end-up being freed twice: in the txq_init error path, and in txq_deinit. This lead to issues as txq_deinit would work on already freed memory regions: kernel BUG at mm/slub.c:3915! Internal error: Oops - BUG: 0 [#1] PREEMPT SMP This patch fixes this by removing the txq_init own error path, as the txq_deinit function is always called on errors. This was introduced by TSO as way more buffers are allocated. Fixes: 186cd4d4e414 ("net: mvpp2: software tso support") Signed-off-by: Antoine Tenart Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/mvpp2.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/ma= rvell/mvpp2.c index fcf9ba5eb8d1..8044cfb0b667 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -5606,7 +5606,7 @@ static int mvpp2_txq_init(struct mvpp2_port *port, sizeof(*txq_pcpu->buffs), GFP_KERNEL); if (!txq_pcpu->buffs) - goto cleanup; + return -ENOMEM; =20 txq_pcpu->count =3D 0; txq_pcpu->reserved_num =3D 0; @@ -5619,26 +5619,10 @@ static int mvpp2_txq_init(struct mvpp2_port *port, &txq_pcpu->tso_headers_dma, GFP_KERNEL); if (!txq_pcpu->tso_headers) - goto cleanup; + return -ENOMEM; } =20 return 0; -cleanup: - for_each_present_cpu(cpu) { - txq_pcpu =3D per_cpu_ptr(txq->pcpu, cpu); - kfree(txq_pcpu->buffs); - - dma_free_coherent(port->dev->dev.parent, - txq_pcpu->size * TSO_HEADER_SIZE, - txq_pcpu->tso_headers, - txq_pcpu->tso_headers_dma); - } - - dma_free_coherent(port->dev->dev.parent, - txq->size * MVPP2_DESC_ALIGNED_SIZE, - txq->descs, txq->descs_dma); - - return -ENOMEM; } =20 /* Free allocated TXQ resources */ --=20 2.11.0