From patchwork Tue Aug 6 22:45:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 1143060 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="GbTjz/2s"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4638qd5PMnz9sNm for ; Wed, 7 Aug 2019 08:45:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726853AbfHFWpp (ORCPT ); Tue, 6 Aug 2019 18:45:45 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:36179 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbfHFWpp (ORCPT ); Tue, 6 Aug 2019 18:45:45 -0400 Received: by mail-lj1-f196.google.com with SMTP id i21so4368427ljj.3 for ; Tue, 06 Aug 2019 15:45:44 -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=yFlcIGmAU2Q+uytclp71VZt3u5YOqHJodYGg72mUCzc=; b=GbTjz/2s4NjsyNf0XtwpIGx2XV/fhtcfMSKIKlRJXkD9uQ5mQ9ip7LHSp5MrQDSHT2 9H/vZ9roGFqPllWoYovJJRa2aOtFjhsPn9Iw0pWUW1ZMVPfk9U//Ju8G/l9ovKsbufzw q2wrMMGsHQ2w/MUQavcj7lKXuvcx6eitC4HKg3t7C7rlYZzovmqS49rkgQ/esrqfnDVw eezHif8/em/bku2sgVbKe1P/SCNc7B0DBllLUk87nFP6btrR4iLrw8zILBq4PP0IJrY3 LT3JoHgVDe597SQVwij/Fx9Mu4spKfE9Qcfen+HJUIyptPt55p48MZm3sA5kvjY5UYGY hK0g== 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=yFlcIGmAU2Q+uytclp71VZt3u5YOqHJodYGg72mUCzc=; b=XF6969J0vlgkRJyEoJEcKba/fx215csbY6KwUaBMTM1w2lQKC0y+C3Dt4A6qWaejy/ 4kutqkab+X6/XeFa9YsK+PdUB8D1sRyjY51/O+MWwmiKgX7B3q+3eF1OusBOyaTrsSnK MvZb5sFpvUc2zIZJV/KYp9H6U+G78lViVQNm7pTC8u0AhElZxgNT24a6QStO4veTvg1N lzSVJhQongMuX+iGtloZRydstD55rga1mvQhs5n08bxZ6gG+HrVyEuUvpWKhN/nYS7Bj Do/k5kLlue3ucWPXGlgU2RRs6gcig6zQnsFG2a/ytiAN6JQRF3lEymWzIyF0xtVAIqNi 6QYA== X-Gm-Message-State: APjAAAUPnqO1UG5ahB2wfrtUzR8XKWYUGe4fZR00OjHd+kfeUBIqEZSn hZJ5vkINZ/d/8eP+pFTfM6ZmaA== X-Google-Smtp-Source: APXvYqzv5v+UvSduzIqq3jgfq6+g5eZaOOBvLM0FzCtbv2aLfiIX6ycIMkVZq1lfC5ch9/jKKSToMg== X-Received: by 2002:a2e:96d5:: with SMTP id d21mr3024100ljj.170.1565131543482; Tue, 06 Aug 2019 15:45:43 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id j30sm2540507lfk.48.2019.08.06.15.45.42 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 06 Aug 2019 15:45:42 -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 v2] net: sched: sch_taprio: fix memleak in error path for sched list parse Date: Wed, 7 Aug 2019 01:45:40 +0300 Message-Id: <20190806224540.24912-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 error case, 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") Acked-by: Vinicius Costa Gomes Signed-off-by: Ivan Khoronzhuk --- 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 c39db507ba3f..e25d414ae12f 100644 --- a/net/sched/sch_taprio.c +++ b/net/sched/sch_taprio.c @@ -1195,7 +1195,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; }