Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp2960695ybk; Mon, 18 May 2020 12:09:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzppH8HWoUTZWuWMCsmtKVbiX5rgfIY7IMHqXXY4Of5gC4VcMMme9fbhvnMRKqChwMRJcjV X-Received: by 2002:a17:906:a856:: with SMTP id dx22mr16833542ejb.255.1589828949496; Mon, 18 May 2020 12:09:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589828949; cv=none; d=google.com; s=arc-20160816; b=mPeBKn1GNSjbE6M7jFr4i10PEDHEmkhM1T/tbrE7Ii3kg1XlUZ/t8VQxfFN2iqvKRt wNEPhLX/h1CS+2zN+YFTxfSknM8PfzMbh7QeIyVmXLVWdREcRGFDXpdj+8eYdkwS/EyQ nlujb3sFuBZHz2qkkBBZO+r7/s6nyXaY+F+KWwD0IqqUccOemt3dNlbzhmCf6//7eoCd HjtdvTailtW34rsym/Qo/Z2BjDBPHtEDus9J8qpjyRwxL9xoxhsGehXSCiqoCnvh/aAa kn/yOYuH9plfKv0A93gsibTvFzby7t92A0Mco1UJ2+sjR3Iutv+N42u3ePaqP0+UPa+w XDlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5wLzGsJyld+RoD1gKLYkamqFxYxGfayruBD8neatvKw=; b=dltjVlxLHgD5OmUJMvofvUo9QQ4Qj/V0mZ+yFNOMA00nKjZ3Iixvmyr83A1NWMAzYQ VemAa6JnYxZA1ot5itnecVrRMkn+0YfOCxtJ9H/9sVMdIFhh+x/YdR1vKygH4298rEu7 JMGv/+uNd0NJP+tYEHv5ne4PT6bE4Xf/gVqFB8+DOtnoyTmOooAAfAUYDvVEHeXfLzM2 nXh08fCuzLrvKEHbXiyRpfAHylbsGEX7mzBZ2Iqk1P6S6IrAx9FiHlGP5pTdXlnnw6vB lYtVLFKBIaWuDWqZC5WJ7wyF9xM/4j3NNxOS0dOo4PdS8yO2vVRUUKebqZrRaBt3iacD Ehzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wtmTlDSG; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c11si4956377ejx.440.2020.05.18.12.08.46; Mon, 18 May 2020 12:09:09 -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=@kernel.org header.s=default header.b=wtmTlDSG; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729469AbgERRmq (ORCPT + 99 others); Mon, 18 May 2020 13:42:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:39530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729434AbgERRmc (ORCPT ); Mon, 18 May 2020 13:42:32 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 F317E20829; Mon, 18 May 2020 17:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589823751; bh=CGePmMPwwQSqI/UZxuTkF09HS53/qmzLh96HTTGfteM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wtmTlDSG+6XslL/3dlLRHK+uSsVlG03jUaueAY8h/b5sUQ2AVvxjMy2WLvNfAeZhi lDeM33wYQIrryt8vDH3SbhuM4/IiJKOOErsdyWgQXZwgQ/t4THFjItzblechVg4m1H 3kBZATRbTYxHgdSz0TUVeBEPHF4fJc8tdjsnGv5g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiyu Yang , Xin Tan , Sven Eckelmann , Simon Wunderlich Subject: [PATCH 4.9 21/90] batman-adv: Fix refcnt leak in batadv_store_throughput_override Date: Mon, 18 May 2020 19:35:59 +0200 Message-Id: <20200518173455.473188193@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518173450.930655662@linuxfoundation.org> References: <20200518173450.930655662@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiyu Yang commit 6107c5da0fca8b50b4d3215e94d619d38cc4a18c upstream. 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. Fixes: 0b5ecc6811bd ("batman-adv: add throughput override attribute to hard_ifaces") Signed-off-by: Xiyu Yang Signed-off-by: Xin Tan Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman --- net/batman-adv/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -1087,7 +1087,7 @@ static ssize_t batadv_store_throughput_o 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)