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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 8B6D0C433DF for ; Mon, 20 Jul 2020 15:56:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D18722CF7 for ; Mon, 20 Jul 2020 15:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260567; bh=I6NXEEfK5JI78L1/UdbeoToJ7nBUSo1pNXloKT410Ag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b6Ny8fm2kkNWs5/ytnRvZd80eoVJMqxL/0ooqbYZYsWl4p2Ca6kPoju0PDnJP5SGH o8QRpepmuf3Gxc+lU8TsF6kBtS+jzvVnjFAPv/fQLTIBodEz6c8veBSCVwmAlE3lkb LB9w3DuxtB6n8SL9QcyHTFL0AUwdveyfrKfbQMH0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731755AbgGTP4G (ORCPT ); Mon, 20 Jul 2020 11:56:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:55446 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730046AbgGTP4D (ORCPT ); Mon, 20 Jul 2020 11:56:03 -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 A1F4422CAF; Mon, 20 Jul 2020 15:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260563; bh=I6NXEEfK5JI78L1/UdbeoToJ7nBUSo1pNXloKT410Ag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wDV6/brlvL0xgxo7yn8Gkr4el6URimiCAGJZ0HE1tf7ttJ/FvTJYWyJ3kP2tVZHhn nBTpmgI/VD7py/4cvltmqruxBSoThvXTHOoeTFspnmaCeFh3ur/QzzFWzur8NI+cWx rJo+lg8hYCY6W5cgiUP42On8XUFro7hmT6NAEch8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jamal Hadi Salim , Jiri Pirko , Cong Wang , "David S. Miller" , syzbot+d411cff6ab29cc2c311b@syzkaller.appspotmail.com Subject: [PATCH 5.4 014/215] net_sched: fix a memory leak in atm_tc_init() Date: Mon, 20 Jul 2020 17:34:56 +0200 Message-Id: <20200720152820.839210434@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152820.122442056@linuxfoundation.org> References: <20200720152820.122442056@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Cong Wang [ Upstream commit 306381aec7c2b5a658eebca008c8a1b666536cba ] When tcf_block_get() fails inside atm_tc_init(), atm_tc_put() is called to release the qdisc p->link.q. But the flow->ref prevents it to do so, as the flow->ref is still zero. Fix this by moving the p->link.ref initialization before tcf_block_get(). Fixes: 6529eaba33f0 ("net: sched: introduce tcf block infractructure") Reported-and-tested-by: syzbot+d411cff6ab29cc2c311b@syzkaller.appspotmail.com Cc: Jamal Hadi Salim Cc: Jiri Pirko Signed-off-by: Cong Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_atm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -553,16 +553,16 @@ static int atm_tc_init(struct Qdisc *sch if (!p->link.q) p->link.q = &noop_qdisc; pr_debug("atm_tc_init: link (%p) qdisc %p\n", &p->link, p->link.q); + p->link.vcc = NULL; + p->link.sock = NULL; + p->link.common.classid = sch->handle; + p->link.ref = 1; err = tcf_block_get(&p->link.block, &p->link.filter_list, sch, extack); if (err) return err; - p->link.vcc = NULL; - p->link.sock = NULL; - p->link.common.classid = sch->handle; - p->link.ref = 1; tasklet_init(&p->task, sch_atm_dequeue, (unsigned long)sch); return 0; }