From patchwork Tue Jan 8 23:27:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10753127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8BFB8746 for ; Tue, 8 Jan 2019 23:27:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BCA128DD5 for ; Tue, 8 Jan 2019 23:27:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F91828DDF; Tue, 8 Jan 2019 23:27:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 112E228DD5 for ; Tue, 8 Jan 2019 23:27:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729137AbfAHX1M (ORCPT ); Tue, 8 Jan 2019 18:27:12 -0500 Received: from mail-eopbgr140047.outbound.protection.outlook.com ([40.107.14.47]:11463 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728887AbfAHX1M (ORCPT ); Tue, 8 Jan 2019 18:27:12 -0500 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=wsn2oI3N52gQBu55CXIlJ+ZSBLySD1JLpKdxCjnhbUg=; b=XuPdfm6HfO+2YdPDdeCAoVcY1VT9xJppr0d/BjNlz44I/PWTToXHUVrIGvjNOMeWH/R0445NGeCEBzj3nxdznKvQ/uisDbq1SFkZgxvXgcDWBowDpXAN+TgIOPNlRKC23tZ9q3UR3G/AHR0NRUW0WTy/8c/R+TT01bRabk1OyJ4= Received: from HE1PR05MB4601.eurprd05.prod.outlook.com (20.176.163.138) by HE1PR05MB1226.eurprd05.prod.outlook.com (10.161.119.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1516.13; Tue, 8 Jan 2019 23:27:06 +0000 Received: from HE1PR05MB4601.eurprd05.prod.outlook.com ([fe80::75a0:a89d:1227:7ed3]) by HE1PR05MB4601.eurprd05.prod.outlook.com ([fe80::75a0:a89d:1227:7ed3%5]) with mapi id 15.20.1495.011; Tue, 8 Jan 2019 23:27:06 +0000 From: Jason Gunthorpe To: "David S. Miller" , "linux-rdma@vger.kernel.org" , "netdev@vger.kernel.org" CC: Willem de Bruijn , Leon Romanovsky Subject: [PATCH] packet: Do not leak dev refcounts on error exit Thread-Topic: [PATCH] packet: Do not leak dev refcounts on error exit Thread-Index: AQHUp6mrtSL+n7MvxkScd/8ZiCsSuQ== Date: Tue, 8 Jan 2019 23:27:06 +0000 Message-ID: <20190108232658.GA1911@ziepe.ca> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: CO2PR04CA0057.namprd04.prod.outlook.com (2603:10b6:102:1::25) To HE1PR05MB4601.eurprd05.prod.outlook.com (2603:10a6:7:99::10) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jgg@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [174.3.196.123] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;HE1PR05MB1226;6:qh+dzN08erUB+j5APYt7NB7mz0HZw5zry6PWn4YORjBXAJFGfzHscwympnzzY9biT8WZzyRkHYm654OYd2M6/lO+VRMd2MRxXjgtMg4B5xMVBz+sOJfr4vg2sCIfsVxN9pYThcNp/EPhs5Jo7PmUEkOHeRhnELuog+nWGAoHZNSHzWJBn97kZuuhLZ606bQllaRBNwy8VuYZGXQ36IDVRkwPoSUWL48PnaNN+6YJlzxgOcq6m5NR/ks3Fvo5IoXFGGepalgFCYL6gogEDCOYSQLvQ0WYAXwm1tp90gPPLH08/TqVO3yc2Et5KE+3B07wE6nOh7ih/vdN6EBS3DH5CwgrQVLVdbkOwoHkGiOc5yn38/O02rd4AZBiDCyvgER8rwaffTF/bpHzDOXPSmFmq3MgKa8FwZd6DxcIBRYZ5nrGVC7m3DnLECIu7EK7GIiSeKqPCVpyTDia/FCaBClCVw==;5:7ytHusBQ5wUkgVG4XGf1VwLHRaYuhJRTsz0GKkrybav7NBrogpPgntO7GUtXHu2OF+LbT2vGm8wSOnju7C08Hha4vqJujXBpBelk8aSQIxZ6f9B50GpCZvuPRChDPConFjlq0XcS9W7W1WmRTFtBveu8BAAJ9YhpAsT6Nt0Np/TQGl/D3FQPbUsWjaaPK5ANtN1lyBVDpMCbZXjabeN93w==;7:RaYJnPd9nYJcPjRAkzb0042xFCzYxsHAbMinho2FXHWw5ObENxg0EsfnuzqSix2YyQ1ItBIPILbSeYJiqwa+coLcLNykWYumy4wD3SJD+3kXOnGJXqy+snlvmC5e4tXKz3X5OPwrNu1f0BdZijDu4Q== x-ms-office365-filtering-correlation-id: a347cc40-426c-45ca-ef19-08d675c0cd4f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:HE1PR05MB1226; x-ms-traffictypediagnostic: HE1PR05MB1226: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(93006095)(93001095)(3231475)(944501520)(52105112)(3002001)(10201501046)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699051)(76991095);SRVR:HE1PR05MB1226;BCL:0;PCL:0;RULEID:;SRVR:HE1PR05MB1226; x-forefront-prvs: 0911D5CE78 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(136003)(346002)(396003)(39860400002)(376002)(199004)(189003)(14444005)(6486002)(256004)(2906002)(5660300001)(305945005)(2201001)(8676002)(6512007)(9686003)(86362001)(8936002)(25786009)(81156014)(81166006)(14454004)(97736004)(66066001)(478600001)(7736002)(486006)(99286004)(26005)(1076003)(186003)(386003)(6506007)(68736007)(6436002)(54906003)(316002)(110136005)(102836004)(33656002)(36756003)(71200400001)(33896004)(71190400001)(107886003)(52116002)(2501003)(106356001)(476003)(53936002)(6116002)(3846002)(105586002)(4326008);DIR:OUT;SFP:1101;SCL:1;SRVR:HE1PR05MB1226;H:HE1PR05MB4601.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: JtD7B0ICv9AL1zyyTCgyeHxiQXHdvuKpmY35A7slOrzTveRD8CGJZiwhUe1O5qHPo1bhI6PBoLM9lNddnW19oqjRi6/6TbNS7Wr5dVscLh8kV+dZrgw9MLfv5tRUPIXF1U+Pdj8zxpb4M7yZeBDEzG7SsaXrZvieep/SA3F0Wa9s3je8yi8Yxx82xZiYlmrHnIffnS+lHl3pjhbK+CFWUQs8dStQmjuRiyvBGCeRndS6afgYWnu0p7HOwd1s36raK3QQbbRtPPhMGbWyDFVaywkDSI22CS1kx8s+ilJ5UZUi/9XySF1Y1W/EzcU8c/0Q spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <253C6A0983443A4C9259ED32537E793A@eurprd05.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: a347cc40-426c-45ca-ef19-08d675c0cd4f X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jan 2019 23:27:05.8232 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB1226 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 'dev' is non NULL when the addr_len check triggers so it must goto a label that does the dev_put otherwise dev will have a leaked refcount. This bug causes the ib_ipoib module to become unloadable when using systemd-network as it triggers this check on InfiniBand links. Fixes: 99137b7888f4 ("packet: validate address length") Reported-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe Acked-by: Willem de Bruijn --- net/packet/af_packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) This patch should go to -rc please. Thanks diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index eedacdebcd4c61..d0945253f43b3e 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2628,7 +2628,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) addr = saddr->sll_halen ? saddr->sll_addr : NULL; dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex); if (addr && dev && saddr->sll_halen < dev->addr_len) - goto out; + goto out_put; } err = -ENXIO; @@ -2828,7 +2828,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) addr = saddr->sll_halen ? saddr->sll_addr : NULL; dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex); if (addr && dev && saddr->sll_halen < dev->addr_len) - goto out; + goto out_unlock; } err = -ENXIO;