From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Sun, 27 Apr 2008 05:24:10 +0000 (-0700)
Subject: XFRM: AUDIT: Fix flowlabel text format ambibuity.
X-Git-Tag: v2.6.25.4~33
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b0af3e580c2d2213dad67075d55f980ebbad29dc;p=karo-tx-linux.git

XFRM: AUDIT: Fix flowlabel text format ambibuity.

[ Upstream commit: 27a27a2158f4fe56a29458449e880a52ddee3dc4 ]

Flowlabel text format was not correct and thus ambiguous.
For example, 0x00123 or 0x01203 are formatted as 0x123.
This is not what audit tools want.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 58f1f9347b54..413885c7bd25 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -2093,7 +2093,7 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
 		iph6 = ipv6_hdr(skb);
 		audit_log_format(audit_buf,
 				 " src=" NIP6_FMT " dst=" NIP6_FMT
-				 " flowlbl=0x%x%x%x",
+				 " flowlbl=0x%x%02x%02x",
 				 NIP6(iph6->saddr),
 				 NIP6(iph6->daddr),
 				 iph6->flow_lbl[0] & 0x0f,