From patchwork Mon Jun 13 22:08:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 634931 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 3rT6PM395Vz9t0Z for ; Tue, 14 Jun 2016 08:08:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b=V4/V+6Mv; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753738AbcFMWIw (ORCPT ); Mon, 13 Jun 2016 18:08:52 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:33376 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752792AbcFMWIv (ORCPT ); Mon, 13 Jun 2016 18:08:51 -0400 Received: by mail-it0-f67.google.com with SMTP id i6so9007604ith.0 for ; Mon, 13 Jun 2016 15:08:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=cBl17iOIHRXX8QX9PD/409oS8OqRFlJGUqe5NaY577k=; b=V4/V+6MvPAayNdEXbuN0oW/TqG/l07nsaH/pJA5DZM8ESS+PSoj4OAAPJOc9FBWjUg 6Vrak4i/msWlJUoXOJU2WaGhhlfqMQnPNEO1Ogg/KWmYWaV7QTsxePO+JZbWjlQuxS2N sIwRnyBwDP5X7migKM8tP/Y8O6CPNrK6U6OUtWCJ8Qi5Q/9Ue8fvvsCfZVsaa1ZlpnL1 UBd8kDIQ3sng7E9tP+hEW06dEElSZ/+bdZmi3GzbjEp17UF/R2Ddt7hjiFPU/Mf+0w3B vqNRVWYgGxaAUaOV227XfvMH1D78Q0de3aAdaIdOiq9gODiuAxkHn/fWYcrixjL9q5Ah 5guA== 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; bh=cBl17iOIHRXX8QX9PD/409oS8OqRFlJGUqe5NaY577k=; b=RHx+u/NOyOfbELtVhvlBeC45nIcekzcLJ8Kuwh9JMfobAmQKC3bQ42depcEPKl6Vqm K/cV17xq/IP+AXDr0kQwmw1XozZs3h2c8rP3DOiNmLuyPWdMb+CCavlA+WjxtxsrQzSF 2xKlk8Sd6famlfmi9cWbYt+D8O81CdjlsdVUg1qvbN2pYffgWiGkG4rYSsVIL8wd8LZh /6EZYEpU+if3EFS3631kIwKpXNnusVa0OiB4saWTb33jrLLogKeOnQj2KNtsfNMdnaOu 2rx/Lw/xC/Kl85YbZ08gjtRAY8FJtyRA1SV7D1BAGe5dexMwLBhScOxSqZBiOkh9uPDs kYyQ== X-Gm-Message-State: ALyK8tInNYBWpavfxMeeuByn+T3NR3YMKVKiOkbAne3Ize9orKBRmiFosXyrYJk0r4/+ig== X-Received: by 10.36.60.20 with SMTP id m20mr21847623ita.81.1465855730777; Mon, 13 Jun 2016 15:08:50 -0700 (PDT) Received: from jhs-UX303LB.lan ([64.26.149.125]) by smtp.gmail.com with ESMTPSA id w10sm426858itc.1.2016.06.13.15.08.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Jun 2016 15:08:50 -0700 (PDT) From: Jamal Hadi Salim X-Google-Original-From: Jamal Hadi Salim To: davem@davemloft.net Cc: netdev@vger.kernel.org, daniel@iogearbox.net, xiyou.wangcong@gmail.com, Jamal Hadi Salim Subject: [PATCH net 1/1] net sched actions: bug fix dumping actions directly didnt produce NLMSG_DONE Date: Mon, 13 Jun 2016 18:08:42 -0400 Message-Id: <1465855722-26727-1-git-send-email-jhs@emojatatu.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jamal Hadi Salim This refers to commands to direct action access as follows: sudo tc actions add action drop index 12 sudo tc actions add action pipe index 10 And then dumping them like so: sudo tc actions ls action gact iproute2 worked because it depended on absence of TCA_ACT_TAB TLV as end of message. This fix has been tested with iproute2 and is backward compatible. Signed-off-by: Jamal Hadi Salim Acked-by: Cong Wang --- net/sched/act_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 336774a..c7a0b0d 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -1118,7 +1118,7 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb) nla_nest_end(skb, nest); ret = skb->len; } else - nla_nest_cancel(skb, nest); + nlmsg_trim(skb, b); nlh->nlmsg_len = skb_tail_pointer(skb) - b; if (NETLINK_CB(cb->skb).portid && ret)