From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:40974 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752168AbbJRAeN (ORCPT ); Sat, 17 Oct 2015 20:34:13 -0400 Subject: Patch "fib_rules: Fix dump_rules() not to exit early" has been added to the 3.14-stable tree To: roland@kernel.org, gregkh@linuxfoundation.org, roland@purestorage.com Cc: , From: Date: Sat, 17 Oct 2015 17:34:12 -0700 In-Reply-To: <1444066168-5566-1-git-send-email-roland@kernel.org> Message-ID: <1445128452122168@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled fib_rules: Fix dump_rules() not to exit early to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: fib_rules-fix-dump_rules-not-to-exit-early.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From roland@kernel.org Sat Oct 17 17:11:23 2015 From: Roland Dreier Date: Mon, 5 Oct 2015 10:29:28 -0700 Subject: fib_rules: Fix dump_rules() not to exit early To: netdev@vger.kernel.org, stable@vger.kernel.org Cc: Roland Dreier Message-ID: <1444066168-5566-1-git-send-email-roland@kernel.org> From: Roland Dreier Backports of 41fc014332d9 ("fib_rules: fix fib rule dumps across multiple skbs") introduced a regression in "ip rule show" - it ends up dumping the first rule over and over and never exiting, because 3.19 and earlier are missing commit 053c095a82cf ("netlink: make nlmsg_end() and genlmsg_end() void"), so fib_nl_fill_rule() ends up returning skb->len (i.e. > 0) in the success case. Fix this by checking the return code for < 0 instead of != 0. Signed-off-by: Roland Dreier Signed-off-by: Greg Kroah-Hartman --- net/core/fib_rules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -631,7 +631,7 @@ static int dump_rules(struct sk_buff *sk err = fib_nl_fill_rule(skb, rule, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, RTM_NEWRULE, NLM_F_MULTI, ops); - if (err) + if (err < 0) break; skip: idx++; Patches currently in stable-queue which might be from roland@kernel.org are queue-3.14/fib_rules-fix-dump_rules-not-to-exit-early.patch