Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp634830ybz; Wed, 15 Apr 2020 15:36:31 -0700 (PDT) X-Google-Smtp-Source: APiQypK8vG2fH6K1TTOG+E+uQ+iaHknInxVFmoTgM46rfVdHESJQmk4mqT0nx6d+/jAkt815+iqx X-Received: by 2002:aa7:cc92:: with SMTP id p18mr4270696edt.166.1586990190990; Wed, 15 Apr 2020 15:36:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586990190; cv=none; d=google.com; s=arc-20160816; b=PNDMvW2kwXwXWo1dtP3jDf5vy9G6NamEeA4RXrjLibhAT0TWZKYTM5TSypRJfLAVJB qhhvrV315+jyqBhT3d5bmQwIr5ryMaA5zsAatFue8A6AfVvsqt6RWO4jxUPfjCUIgpPa wTExWVtepjfAMj7Lm8285KFBaA7wmMXw/ytqlk8iZzbEIL6zBZb9skN2hJJCUQmy2EBj AKaiDV4CeNQXUxy7BxyT47sbs3vi3BXZMJjdR/xXe9pa6QVHEk2FSw43K32NmbZKk2Bj vR9g+y4h+w8othSkvCs2xYiD+nFdia8Buep70Yovfjnmwe5O3w6eYYBzeXuhNDbHG3sC 7s4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=VMnYF5TnPGxJ5+udwsvMtzst56MUMS4Z9fbliVTfT90=; b=IWnb97aVZKUyUA9moComB9NaXYdcKY0n4exnq++syCi8NjzwpV8Gefa3Tsj7/C5xTN AH6sNjamDWF345fZsU+KSnnMJO82PHXRmSTUtlj6HTIpw0AAV3+gxpAE5jNip+Eu4Fgv oWCRxGdP1TWDZXL/CibnQ/yZdBepMLXjiWuaf3Jup0r4ZvvXofMystKEQBo2IFUsbcKP LGBeDINNbeV09RM0yEN9FcP7ZdSZ1H9+kkGHr/eJeT2rQReHyuc7FKWQD36hbJlTgbh2 KWBnRY7fdlprUH7dIsHb33PFoArY8LvuwlatfpozVwDWHbWi+XF56C4WDhZll+HkCfdn cy4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fudan.edu.cn header.s=dkim header.b=2FKqfOEK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fudan.edu.cn Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b89si2568216edf.345.2020.04.15.15.36.07; Wed, 15 Apr 2020 15:36:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@fudan.edu.cn header.s=dkim header.b=2FKqfOEK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fudan.edu.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408139AbgDOIgh (ORCPT + 99 others); Wed, 15 Apr 2020 04:36:37 -0400 Received: from mail.fudan.edu.cn ([202.120.224.10]:41525 "EHLO fudan.edu.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2894643AbgDOIgG (ORCPT ); Wed, 15 Apr 2020 04:36:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fudan.edu.cn; s=dkim; h=Received:From:To:Cc:Subject:Date: Message-Id; bh=VMnYF5TnPGxJ5+udwsvMtzst56MUMS4Z9fbliVTfT90=; b=2 FKqfOEKFliU3EL8KOJeXvxfQOqrjpFqxPhPDoo2jGJS/0xvhDEBAimJJ/UAuS5ln 4eQ12SqJkAT+Bq9tXbz/7Kd66NOiyS44jI7wg2KA58LWMXfKnEqUYOLyT0GhAqdU //LZpjElaZSp0LZp1rVFJRoa0tGHf+utMA5VAwkc9c= Received: from localhost.localdomain (unknown [120.229.255.108]) by app1 (Coremail) with SMTP id XAUFCgCXn_9nx5Ze5XtFAA--.16484S3; Wed, 15 Apr 2020 16:35:52 +0800 (CST) From: Xiyu Yang To: Marek Lindner , Simon Wunderlich , Antonio Quartulli , Sven Eckelmann , "David S. Miller" , Jakub Kicinski , b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: yuanxzhang@fudan.edu.cn, kjlu@umn.edu, Xiyu Yang , Xin Tan Subject: [PATCH] batman-adv: Fix refcnt leak in batadv_store_throughput_override Date: Wed, 15 Apr 2020 16:35:21 +0800 Message-Id: <1586939721-69731-1-git-send-email-xiyuyang19@fudan.edu.cn> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: XAUFCgCXn_9nx5Ze5XtFAA--.16484S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Zw43KF45Cw17Cr4xtF4fKrg_yoW8GFWDpr WYkwnxGr4vg3WDG3Z8t345Wa15AFsrJFWUGFWrCr15urs3GwnYyryrtFyYgF1UAayrKw1v gF4avFZxAFyDCFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9K14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26rxl 6s0DM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s 0DM2vYz4IE04k24VAvwVAKI4IrM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAG YxC7M4IIrI8v6xkF7I0E8cxan2IY04v7MxkIecxEwVAFwVW8ZwCF04k20xvY0x0EwIxGrw CFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE 14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2 IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxK x2IYs7xG6Fyj6rWUJwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14 v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUYmhFUUUUU X-CM-SenderInfo: irzsiiysuqikmy6i3vldqovvfxof0/ Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org batadv_show_throughput_override() invokes batadv_hardif_get_by_netdev(), which gets a batadv_hard_iface object from net_dev with increased refcnt and its reference is assigned to a local pointer 'hard_iface'. When batadv_store_throughput_override() returns, "hard_iface" becomes invalid, so the refcount should be decreased to keep refcount balanced. The issue happens in one error path of batadv_store_throughput_override(). When batadv_parse_throughput() returns NULL, the refcnt increased by batadv_hardif_get_by_netdev() is not decreased, causing a refcnt leak. Fix this issue by jumping to "out" label when batadv_parse_throughput() returns NULL. Signed-off-by: Xiyu Yang Signed-off-by: Xin Tan --- net/batman-adv/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index c45962d8527b..97736696d042 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -1150,7 +1150,7 @@ static ssize_t batadv_store_throughput_override(struct kobject *kobj, ret = batadv_parse_throughput(net_dev, buff, "throughput_override", &tp_override); if (!ret) - return count; + goto out; old_tp_override = atomic_read(&hard_iface->bat_v.throughput_override); if (old_tp_override == tp_override) -- 2.7.4