netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH nf-next] netfilter: nf_log: use %s format string for buffer
@ 2014-01-06  0:04 Daniel Borkmann
  2014-01-06 13:21 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel Borkmann @ 2014-01-06  0:04 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

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>
---
 net/netfilter/nf_conntrack_proto_dccp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
index a99b6c3..3841268 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,
 out_invalid:
 	if (LOG_INVALID(net, IPPROTO_DCCP))
 		nf_log_packet(net, nf_ct_l3num(ct), 0, skb, NULL, NULL,
-			      NULL, msg);
+			      NULL, "%s", msg);
 	return false;
 }
 
@@ -614,7 +614,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
 
 out_invalid:
 	if (LOG_INVALID(net, IPPROTO_DCCP))
-		nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, msg);
+		nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, "%s", msg);
 	return -NF_ACCEPT;
 }
 
-- 
1.7.11.7


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH nf-next] netfilter: nf_log: use %s format string for buffer
  2014-01-06  0:04 [PATCH nf-next] netfilter: nf_log: use %s format string for buffer Daniel Borkmann
@ 2014-01-06 13:21 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2014-01-06 13:21 UTC (permalink / raw)
  To: Daniel Borkmann; +Cc: netfilter-devel

On Mon, Jan 06, 2014 at 01:04:16AM +0100, Daniel Borkmann wrote:
> 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.

applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-01-06 13:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-06  0:04 [PATCH nf-next] netfilter: nf_log: use %s format string for buffer Daniel Borkmann
2014-01-06 13:21 ` Pablo Neira Ayuso

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).