From: Nick Desaulniers <ndesaulniers@google.com>
To: Pablo Neira Ayuso <pablo@netfilter.org>,
Jozsef Kadlecsik <kadlec@netfilter.org>,
Florian Westphal <fw@strlen.de>
Cc: Nick Desaulniers <ndesaulniers@google.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Nathan Chancellor <natechancellor@gmail.com>,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
clang-built-linux@googlegroups.com
Subject: [PATCH] netfilter: conntrack: fix -Wformat
Date: Fri, 6 Nov 2020 23:55:50 -0800 [thread overview]
Message-ID: <20201107075550.2244055-1-ndesaulniers@google.com> (raw)
Clang is more aggressive about -Wformat warnings when the format flag
specifies a type smaller than the parameter. Fixes 8 instances of:
warning: format specifies type 'unsigned short' but the argument has
type 'int' [-Wformat]
Link: https://github.com/ClangBuiltLinux/linux/issues/378
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
net/netfilter/nf_conntrack_standalone.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 46c5557c1fec..c5aa45c38eb2 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -50,38 +50,38 @@ print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,
switch (l4proto->l4proto) {
case IPPROTO_ICMP:
- seq_printf(s, "type=%u code=%u id=%u ",
+ seq_printf(s, "type=%u code=%u id=%hu ",
tuple->dst.u.icmp.type,
tuple->dst.u.icmp.code,
- ntohs(tuple->src.u.icmp.id));
+ (__be16)ntohs(tuple->src.u.icmp.id));
break;
case IPPROTO_TCP:
seq_printf(s, "sport=%hu dport=%hu ",
- ntohs(tuple->src.u.tcp.port),
- ntohs(tuple->dst.u.tcp.port));
+ (__be16)ntohs(tuple->src.u.tcp.port),
+ (__be16)ntohs(tuple->dst.u.tcp.port));
break;
case IPPROTO_UDPLITE:
case IPPROTO_UDP:
seq_printf(s, "sport=%hu dport=%hu ",
- ntohs(tuple->src.u.udp.port),
- ntohs(tuple->dst.u.udp.port));
+ (__be16)ntohs(tuple->src.u.udp.port),
+ (__be16)ntohs(tuple->dst.u.udp.port));
break;
case IPPROTO_DCCP:
seq_printf(s, "sport=%hu dport=%hu ",
- ntohs(tuple->src.u.dccp.port),
- ntohs(tuple->dst.u.dccp.port));
+ (__be16)ntohs(tuple->src.u.dccp.port),
+ (__be16)ntohs(tuple->dst.u.dccp.port));
break;
case IPPROTO_SCTP:
seq_printf(s, "sport=%hu dport=%hu ",
- ntohs(tuple->src.u.sctp.port),
- ntohs(tuple->dst.u.sctp.port));
+ (__be16)ntohs(tuple->src.u.sctp.port),
+ (__be16)ntohs(tuple->dst.u.sctp.port));
break;
case IPPROTO_ICMPV6:
- seq_printf(s, "type=%u code=%u id=%u ",
+ seq_printf(s, "type=%u code=%u id=%hu ",
tuple->dst.u.icmp.type,
tuple->dst.u.icmp.code,
- ntohs(tuple->src.u.icmp.id));
+ (__be16)ntohs(tuple->src.u.icmp.id));
break;
case IPPROTO_GRE:
seq_printf(s, "srckey=0x%x dstkey=0x%x ",
--
2.29.2.222.g5d2a92d10f8-goog
next reply other threads:[~2020-11-07 7:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-07 7:55 Nick Desaulniers [this message]
2020-11-07 10:32 ` [PATCH] netfilter: conntrack: fix -Wformat Joe Perches
2020-11-08 7:34 ` Lukas Bulwahn
2020-11-08 10:10 ` Joe Perches
2020-11-10 22:00 ` Nick Desaulniers
2020-11-10 22:04 ` Joe Perches
2020-11-10 22:06 ` Nick Desaulniers
2020-12-02 22:34 ` Nick Desaulniers
2020-12-03 0:46 ` Tom Rix
2020-12-03 7:26 ` Lukas Bulwahn
2020-12-03 13:43 ` Miguel Ojeda
2020-12-03 14:40 ` Lukas Bulwahn
2020-12-03 14:39 ` Tom Rix
2020-12-03 16:45 ` Joe Perches
2020-12-13 19:21 ` Tom Rix
2020-12-13 23:25 ` Joe Perches
2020-12-13 23:29 ` Tom Rix
2020-11-07 17:52 ` Jakub Kicinski
2020-11-09 15:43 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201107075550.2244055-1-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=clang-built-linux@googlegroups.com \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=natechancellor@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).