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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A56AFC433F5 for ; Tue, 22 Feb 2022 04:28:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229938AbiBVE24 (ORCPT ); Mon, 21 Feb 2022 23:28:56 -0500 Received: from gmail-smtp-in.l.google.com ([23.128.96.19]:55612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229882AbiBVE2w (ORCPT ); Mon, 21 Feb 2022 23:28:52 -0500 Received: from codeconstruct.com.au (pi.codeconstruct.com.au [203.29.241.158]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A21C639F for ; Mon, 21 Feb 2022 20:17:57 -0800 (PST) Received: by codeconstruct.com.au (Postfix, from userid 10001) id 9AF58202B9; Tue, 22 Feb 2022 12:17:54 +0800 (AWST) From: Matt Johnston To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Jeremy Kerr Subject: [PATCH net-next v3 2/2] mctp: Fix incorrect netdev unref for extended addr Date: Tue, 22 Feb 2022 12:17:39 +0800 Message-Id: <20220222041739.511255-3-matt@codeconstruct.com.au> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220222041739.511255-1-matt@codeconstruct.com.au> References: <20220222041739.511255-1-matt@codeconstruct.com.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the extended addressing local route output codepath dev_get_by_index_rcu() doesn't take a dev_hold() so we shouldn't dev_put(). Signed-off-by: Matt Johnston --- net/mctp/route.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/mctp/route.c b/net/mctp/route.c index 6f277e56b168..5078ce3315cf 100644 --- a/net/mctp/route.c +++ b/net/mctp/route.c @@ -838,7 +838,6 @@ int mctp_local_output(struct sock *sk, struct mctp_route *rt, struct mctp_skb_cb *cb = mctp_cb(skb); struct mctp_route tmp_rt = {0}; struct mctp_sk_key *key; - struct net_device *dev; struct mctp_hdr *hdr; unsigned long flags; unsigned int mtu; @@ -851,12 +850,12 @@ int mctp_local_output(struct sock *sk, struct mctp_route *rt, if (rt) { ext_rt = false; - dev = NULL; - if (WARN_ON(!rt->dev)) goto out_release; } else if (cb->ifindex) { + struct net_device *dev; + ext_rt = true; rt = &tmp_rt; @@ -866,7 +865,6 @@ int mctp_local_output(struct sock *sk, struct mctp_route *rt, rcu_read_unlock(); return rc; } - rt->dev = __mctp_dev_get(dev); rcu_read_unlock(); @@ -947,11 +945,9 @@ int mctp_local_output(struct sock *sk, struct mctp_route *rt, if (!ext_rt) mctp_route_release(rt); - dev_put(dev); mctp_dev_put(tmp_rt.dev); return rc; - } /* route management */ -- 2.32.0