aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2014-01-05 19:04:16 -0500
committerPablo Neira Ayuso <pablo@netfilter.org>2014-01-06 08:19:16 -0500
commit138aef7dca831403e50a719d1be18dfd52027ea2 (patch)
treecc49e991ae4797a7a3d929f592c08dd7c729755a
parent2a50d805e59ed18265fca44825719f35927af8af (diff)
netfilter: nf_conntrack_dccp: use %s format string for buffer
Some invocations of nf_log_packet() use arg buffer directly instead of "%s" format string with follow-up buffer pointer. Currently, these two usages are not really critical, but we should fix this up nevertheless so that we don't run into trouble if that changes one day. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--net/netfilter/nf_conntrack_proto_dccp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
index a99b6c3427b0..38412684a882 100644
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@ -457,7 +457,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
457out_invalid: 457out_invalid:
458 if (LOG_INVALID(net, IPPROTO_DCCP)) 458 if (LOG_INVALID(net, IPPROTO_DCCP))
459 nf_log_packet(net, nf_ct_l3num(ct), 0, skb, NULL, NULL, 459 nf_log_packet(net, nf_ct_l3num(ct), 0, skb, NULL, NULL,
460 NULL, msg); 460 NULL, "%s", msg);
461 return false; 461 return false;
462} 462}
463 463
@@ -614,7 +614,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
614 614
615out_invalid: 615out_invalid:
616 if (LOG_INVALID(net, IPPROTO_DCCP)) 616 if (LOG_INVALID(net, IPPROTO_DCCP))
617 nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, msg); 617 nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, "%s", msg);
618 return -NF_ACCEPT; 618 return -NF_ACCEPT;
619} 619}
620 620