From patchwork Thu Apr 9 22:39:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 6191241 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E3053BF4A6 for ; Thu, 9 Apr 2015 22:40:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 032DE2037E for ; Thu, 9 Apr 2015 22:40:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 042F22037A for ; Thu, 9 Apr 2015 22:39:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754309AbbDIWjp (ORCPT ); Thu, 9 Apr 2015 18:39:45 -0400 Received: from smtprelay0023.hostedemail.com ([216.40.44.23]:60418 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753529AbbDIWjn (ORCPT ); Thu, 9 Apr 2015 18:39:43 -0400 Received: from filter.hostedemail.com (unknown [216.40.38.60]) by smtprelay03.hostedemail.com (Postfix) with ESMTP id 4511B6AC5B; Thu, 9 Apr 2015 22:39:42 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2, 0, 0, , d41d8cd98f00b204, joe@perches.com, :::::::::::::::::::::::::::, RULES_HIT:41:355:379:541:599:968:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1543:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2828:3138:3139:3140:3141:3142:3354:3622:3865:3866:3867:3868:3870:3871:3872:3873:3874:4321:4605:5007:6261:6742:9010:10004:10400:10848:11026:11232:11658:11914:12043:12296:12438:12517:12519:12555:12740:13161:13229:21080, 0, RBL:none, CacheIP:none, Bayesian:0.5, 0.5, 0.5, Netcheck:none, DomainCache:0, MSF:not bulk, SPF:fn, MSBL:0, DNSBL:none, Custom_rules:0:0:0 X-HE-Tag: ear14_1a21d097e3e0e X-Filterd-Recvd-Size: 4537 Received: from joe-X200MA.home (pool-71-119-66-80.lsanca.fios.verizon.net [71.119.66.80]) (Authenticated sender: joe@perches.com) by omf03.hostedemail.com (Postfix) with ESMTPA; Thu, 9 Apr 2015 22:39:39 +0000 (UTC) Message-ID: <1428619177.5413.15.camel@perches.com> Subject: Re: [PATCH 5/5 v2] netfilter: Fix format string of nfnetlink_log proc file From: Joe Perches To: Richard Weinberger , Steven Rostedt Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org, coreteam@netfilter.org, netfilter-devel@vger.kernel.org, linux-kernel@vger.kernel.org, sameo@linux.intel.com, aloisio.almeida@openbossa.org, lauro.venancio@openbossa.org, davem@davemloft.net, kadlec@blackhole.kfki.hu, kaber@trash.net, pablo@netfilter.org Date: Thu, 09 Apr 2015 15:39:37 -0700 In-Reply-To: <1428616637-21690-5-git-send-email-richard@nod.at> References: <1428616637-21690-1-git-send-email-richard@nod.at> <1428616637-21690-5-git-send-email-richard@nod.at> X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, 2015-04-09 at 23:57 +0200, Richard Weinberger wrote: > The printed values are all of type unsigned integer, therefore use > %u instead of %d. Otherwise an user can face negative values. Hey Richard. Just to clarify, this patch is for net and not for net-next as net-next has removed the seq_printf return uses. Are you going to submit an equivalent patch for net-next? > diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c [] > @@ -998,7 +998,7 @@ static int seq_show(struct seq_file *s, void *v) > { > const struct nfulnl_instance *inst = v; > > - return seq_printf(s, "%5d %6d %5d %1d %5d %6d %2d\n", > + return seq_printf(s, "%5u %6u %5u %1u %5u %6u %2u\n", > inst->group_num, > inst->peer_portid, inst->qlen, > inst->copy_mode, inst->copy_range, And Steven, commit e71456ae9871 ("netfilter: Remove checks of seq_printf() return values") mistakenly converted this to use seq_has_overflowed() Ideally all seq_show functions would be converted from int foo_seq_show(...) { seq_printf(s, ...); return seq_has_overflowed(s); } to int foo_seq_show(...) { seq_printf(s, ...); return 0; } I made that mistake in a patch and corrected it later. Here's a suggested -next patch: Perhaps it shouldn't be submitted now as it may conflict with what Richard might submit if he propses an equivalent patch to above for -next. There is an appropriate use of return seq_has_overflowed in: net/netfilter/xt_hashlimit.c:825: return seq_has_overflowed(s); That's not a seq_show function, it's a helper for one. --- net/netfilter/nfnetlink_queue_core.c | 3 ++- net/netfilter/x_tables.c | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c index 6e74655..5f827a1 100644 --- a/net/netfilter/nfnetlink_queue_core.c +++ b/net/netfilter/nfnetlink_queue_core.c @@ -1248,7 +1248,8 @@ static int seq_show(struct seq_file *s, void *v) inst->copy_mode, inst->copy_range, inst->queue_dropped, inst->queue_user_dropped, inst->id_sequence, 1); - return seq_has_overflowed(s); + + return 0; } static const struct seq_operations nfqnl_seq_ops = { diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 51a459c..4dcbea8 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -947,11 +947,10 @@ static int xt_table_seq_show(struct seq_file *seq, void *v) { struct xt_table *table = list_entry(v, struct xt_table, list); - if (strlen(table->name)) { + if (strlen(table->name)) seq_printf(seq, "%s\n", table->name); - return seq_has_overflowed(seq); - } else - return 0; + + return 0; } static const struct seq_operations xt_table_seq_ops = { @@ -1090,7 +1089,7 @@ static int xt_match_seq_show(struct seq_file *seq, void *v) if (*match->name == '\0') return 0; seq_printf(seq, "%s\n", match->name); - return seq_has_overflowed(seq); + break; } return 0; } @@ -1145,7 +1144,7 @@ static int xt_target_seq_show(struct seq_file *seq, void *v) if (*target->name == '\0') return 0; seq_printf(seq, "%s\n", target->name); - return seq_has_overflowed(seq); + break; } return 0; }