From patchwork Wed Aug 26 03:06:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 510701 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 959811402A3 for ; Wed, 26 Aug 2015 13:07:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754833AbbHZDHL (ORCPT ); Tue, 25 Aug 2015 23:07:11 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:33656 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751739AbbHZDGo (ORCPT ); Tue, 25 Aug 2015 23:06:44 -0400 Received: by pacti10 with SMTP id ti10so71732854pac.0 for ; Tue, 25 Aug 2015 20:06:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2DWG1QTBZf6rKQM/g3YMKbG7NEgTDGyBP4rWEW2wm20=; b=GOIVUHLyMBziEJac5gM8YW3kqnqUuIk/S8SUqf2wQoKLbU8RR9mmU/652Tsyk1HRGz M71BLxtCRv9QegDujOLiU7CGG2E83bhrMsXxFA5XtUe2obf7i1lWLf8IKtJxn8XEzoMc 0VflGJGntFBeMsjduxQJK08NJ5V0KzNaQpsmPd4sC7EESC+zXLkvMmrFYXOO3c+S02JL bRqYn4Lu100kDNxabgHVoEDMOIvOZFQ4yQuwONV/ldrXwedOKHKpSSeQb+TQR2jYroC4 DoDaARSknkhqH+58v8Hyl5hVvkdJTqkczGrHoeFRoMsfVy+EvlGBMZEvOenKtRvsHrpZ GBXQ== X-Gm-Message-State: ALoCoQnmnLgxFvR55+6lOHg5F4G254n2JOoDyDFVy3s8D71Tsw+zC3+P0qANWZfhggOVkzPzx7vT X-Received: by 10.68.117.11 with SMTP id ka11mr64675278pbb.77.1440558404303; Tue, 25 Aug 2015 20:06:44 -0700 (PDT) Received: from localhost.localdomain ([12.97.19.195]) by smtp.gmail.com with ESMTPSA id jy10sm22636552pbd.66.2015.08.25.20.06.43 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Aug 2015 20:06:43 -0700 (PDT) From: Alexei Starovoitov To: "David S. Miller" Cc: Eric Dumazet , Daniel Borkmann , netdev@vger.kernel.org Subject: [PATCH v2 net-next 2/5] net_sched: act_bpf: remove unnecessary copy Date: Tue, 25 Aug 2015 20:06:32 -0700 Message-Id: <1440558395-7765-3-git-send-email-ast@plumgrid.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1440558395-7765-1-git-send-email-ast@plumgrid.com> References: <1440558395-7765-1-git-send-email-ast@plumgrid.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix harmless typo and avoid unnecessary copy of empty 'prog' into unused 'strcut tcf_bpf_cfg old'. Fixes: f4eaed28c783 ("act_bpf: fix memory leaks when replacing bpf programs") Signed-off-by: Alexei Starovoitov Acked-by: Daniel Borkmann --- net/sched/act_bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c index 1b97dabc621a..458cf647e698 100644 --- a/net/sched/act_bpf.c +++ b/net/sched/act_bpf.c @@ -327,7 +327,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla, prog = to_bpf(act); spin_lock_bh(&prog->tcf_lock); - if (ret != ACT_P_CREATED) + if (res != ACT_P_CREATED) tcf_bpf_prog_fill_cfg(prog, &old); prog->bpf_ops = cfg.bpf_ops;