From patchwork Tue Aug 6 10:04:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 1142683 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="k1k+QDSC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 462qxQ1vMxz9sN1 for ; Tue, 6 Aug 2019 20:04:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732662AbfHFKEk (ORCPT ); Tue, 6 Aug 2019 06:04:40 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:40039 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732411AbfHFKEi (ORCPT ); Tue, 6 Aug 2019 06:04:38 -0400 Received: by mail-lf1-f67.google.com with SMTP id b17so60599449lff.7 for ; Tue, 06 Aug 2019 03:04:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=5TEpMf9ydlfbXzNe485u5gwcmlpP2W7mB7vtw4xNQQ4=; b=k1k+QDSCc7OEAmnqo1P0gvMHj8zkLFalVRTHvMQKj0URb9HudpNuUObP9zjBvKqYUX bCp2hwTwOlfE0p0ddM+hJrCFL9oiky6xK0F7+cu1S3XiXKkiUpT6OWLR1FVZXBljQXIy K7dYo96ycFB5ghJ+yjERH8T/bCn0mmhCluh150MJMR40LU/0AZb1Ni0cLceGbsvLpu0X AqCDRS5n3bsL7Xviv/rAKvczZSFv5As+y06g6NlZr4obtGbu9vu8ERq32VFhaMSmcEKZ +YQ9dmlQMJRhsikM9tdkn1LTjfjeMuPvr9UcTyHR/xKGLnyeFCBsfgf5hrS+aYg0qAEm rizA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=5TEpMf9ydlfbXzNe485u5gwcmlpP2W7mB7vtw4xNQQ4=; b=hBQ5o9+/W7PCC51BWK3zghExpXl0s6mOU84upy65Sb1Ce4f67WDK1fGzhYxe2yt54d 5uYpjPDvqsDiJ9N4yu10BtkwVWptBPDnJp88cXhAvnqahDAj3V4aT/0ZNqesdS17xgcs ERZSLE4ITCKyWgylz3lqd2y6MRdcKbXNMAsts94wmWAmKVEA5CxWhnjoEXD0CuwoF6sw tCI7BOv9Bz/zuQEGXDMyTnnVKNP/0mWc9ceep//vX6R8FxFhLLv5ip3w4JzF513D7AeJ TzxJEe8BNfuI7js7mpqV1EkWovXrlBmIcsgTfSH/O8HHvxsEC8bLKyZLZxqdKloPIGmQ gBVQ== X-Gm-Message-State: APjAAAWXpjrxzZ0cl7xkIxr/Mb/Z0r/L0zaHQDliDU++neegZgKTdCsc P7GcLuF9VJtnsXSBn1HrDtiqYg== X-Google-Smtp-Source: APXvYqyfqIcqLMxQy4UrrDCOjB1zyM8flnzvJDPhVWpUqIEOQO3yu5z8e/qA1WIffnWRVOfpYdcMQQ== X-Received: by 2002:ac2:5492:: with SMTP id t18mr1889487lfk.41.1565085876500; Tue, 06 Aug 2019 03:04:36 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id p19sm1388903ljg.97.2019.08.06.03.04.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 06 Aug 2019 03:04:35 -0700 (PDT) From: Ivan Khoronzhuk To: vinicius.gomes@intel.com, davem@davemloft.net Cc: jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH] net: sched: sch_taprio: fix memleak in error path for sched list parse Date: Tue, 6 Aug 2019 13:04:25 +0300 Message-Id: <20190806100425.4356-1-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case off error, all entries should be freed from the sched list before deleting it. For simplicity use rcu way. Fixes: 5a781ccbd19e46 ("tc: Add support for configuring the taprio scheduler") Signed-off-by: Ivan Khoronzhuk Acked-by: Vinicius Costa Gomes --- Based on net/master net/sched/sch_taprio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c index b55a82c1e1bc..4f6333035841 100644 --- a/net/sched/sch_taprio.c +++ b/net/sched/sch_taprio.c @@ -1451,7 +1451,8 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt, spin_unlock_bh(qdisc_lock(sch)); free_sched: - kfree(new_admin); + if (new_admin) + call_rcu(&new_admin->rcu, taprio_free_sched_cb); return err; }