From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6857BC2F3A0 for ; Mon, 21 Jan 2019 14:15:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E70B20879 for ; Mon, 21 Jan 2019 14:15:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548080119; bh=Lj1r9kN4fbE0OcdiJWWSHr7jdoFgyrq0Ydj3VzyUI8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Xn3ItRQBaMuJht1bRUVFy99E+eEy8V+9pCa5w//4ibVSaMArMSdePQcGV9jR79N2f O5PU3ttRhYGgnwJhqE9nFXB0ETcCkBq0NCoSzBcZuOSLI+Qgdsg56Y7ou4Y1oHw3iw pv6gP0W12t0sEYclh6C33a21dO2YRjozZR0LoTfI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729476AbfAUOPM (ORCPT ); Mon, 21 Jan 2019 09:15:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:34810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730872AbfAUNvr (ORCPT ); Mon, 21 Jan 2019 08:51:47 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 626B320989; Mon, 21 Jan 2019 13:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548078706; bh=Lj1r9kN4fbE0OcdiJWWSHr7jdoFgyrq0Ydj3VzyUI8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WUE9ByfyOaDIjHYEoszefWpiO8TJ9zWSCHD5Kjy/VJ+hsy8ylpwAf8mWZIQLAxGeF 43vAZmPFcri2lU0qia3zOcMDsUvmVsbxFxYseCu+3Pc80xZVmm6iFNq9RdRLr3gKj6 I99YXEtwDa0ZKsWT1/+YDpyKFBcMLieQpP2q6doo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Leon Romanovsky , Jason Gunthorpe , Willem de Bruijn , "David S. Miller" Subject: [PATCH 4.14 15/59] packet: Do not leak dev refcounts on error exit Date: Mon, 21 Jan 2019 14:43:40 +0100 Message-Id: <20190121122458.238488179@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121122456.529172919@linuxfoundation.org> References: <20190121122456.529172919@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jason Gunthorpe [ Upstream commit d972f3dce8d161e2142da0ab1ef25df00e2f21a9 ] '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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/packet/af_packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2666,7 +2666,7 @@ static int tpacket_snd(struct packet_soc 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; @@ -2866,7 +2866,7 @@ static int packet_snd(struct socket *soc 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;