mac_len uninitialized in ipt_ULOG.c
Subsystems (2)
Hello,
I recently startet using the ulogd daemon to log traffic from a PPPoE interface (have used it on regular ethernet interfaces for long). In the resulting logs, the MAC address was filled with (what seemed to be) garbage like the following entry:
Oct 13 21:15:09 gw INPUT: IN=ppp0 OUT=
MAC=6b:21:c0:00:00:00:00:11:00:00:00:00:00:00:00:00:00:00:00:01:00:00:00:00:00:00:00:63:26:00:00:00:00:00:00:02:26:00:00:7d:26:00:00:00:00:00:00:00:80:8e:c6:00:80:8e:c6:00:00:00:00:00:00:00:00:00:00:00:00:a8:60:76:c1:a8:60:76:c1:00:00:00:00:0c:45:00:00:4e:75:63:00:00:72:11:5e:4f:c1:f9:05:05:50:3f:5d:af:04:01:00:89:00:3a:46:ba:01:00:00:10:00:01:00:00:00:00:00:00:20:43:4b:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:00:00:21:00:01:00:2c:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 SRC=vvv.xxx.yyy.zzz 249.5.5 DST=aaa.bbb.ccc.ddd LEN=78 TOS=00 PREC=0x00
TTL=114 ID=30051 PROTO=UDP SPT=1025 DPT=137 LEN=58
When using the regular LOG target, the MAC field was empty. I traced this back to the ipt_ulog_target function in net/ipv4/netfilter/ipt_ULOG.c in the kernel, where pm->mac_len in the ulog_packet_msg_t struct is left uninitialized, when there is no MAC address.
The attached patch fixes this. It is made against 2.4.19, and I have verified, that it applies to 2.4.20-pre11 as well as the latest patch-o-matic patches from CVS.
Regards,
Anders K. Pedersen
net/ipv4/netfilter/ipt_ULOG.c renamed from net/ipv4/netfilter/ipt_ULOG.c.orig +2 -1
@@ -223,7 +223,8 @@ && in->hard_header_len <= ULOG_MAC_LEN) {memcpy (pm->mac, (*pskb)->mac.raw, in->hard_header_len); pm->mac_len = in->hard_header_len; - } + } else + pm->mac_len = 0;if (in)strncpy (pm->indev_name, in->name,sizeof (pm->indev_name));
Great !
I have been noticing this strange mac-output by ulog. Gonna try your solution...
greetz
Quoted 40 lines · "Anders K. Pedersen"@harrier.cohaesio.com wrote:
Hello,
I recently startet using the ulogd daemon to log traffic from a PPPoE interface (have used it on regular ethernet interfaces for long). In the resulting logs, the MAC address was filled with (what seemed to be) garbage like the following entry:
Oct 13 21:15:09 gw INPUT: IN=ppp0 OUT=MAC=6b:21:c0:00:00:00:00:11:00:00:00:00:00:00:00:00:00:00:00:01:00:00:00:00:00:00:00:63:26:00:00:00:00:00:00:02:26:00:00:7d:26:00:00:00:00:00:00:00:80:8e:c6:00:80:8e:c6:00:00:00:00:00:00:00:00:00:00:00:00:a8:60:76:c1:a8:60:76:c1:00:00:00:00:0c:45:00:00:4e:75:63:00:00:72:11:5e:4f:c1:f9:05:05:50:3f:5d:af:04:01:00:89:00:3a:46:ba:01:00:00:10:00:01:00:00:00:00:00:00:20:43:4b:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:41:00:00:21:00:01:00:2c:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 SRC=vvv.xxx.yyy.zzz 249.5.5 DST=aaa.bbb.ccc.ddd LEN=78 TOS=00 PREC=0x00 TTL=114 ID=30051 PROTO=UDP SPT=1025 DPT=137 LEN=58
When using the regular LOG target, the MAC field was empty. I traced this back to the
ipt_ulog_targetfunction innet/ipv4/netfilter/ipt_ULOG.cin the kernel, wherepm->mac_lenin theulog_packet_msg_tstruct is left uninitialized, when there is no MAC address.The attached patch fixes this. It is made against 2.4.19, and I have verified, that it applies to 2.4.20-pre11 as well as the latest patch-o-matic patches from CVS.
Regards,
Anders K. Pedersen------------------------------------------------------------------------
net/ipv4/netfilter/ipt_ULOG.c renamed from net/ipv4/netfilter/ipt_ULOG.c.orig +2
-1@@ -223,7 +223,8 @@ && in->hard_header_len <= ULOG_MAC_LEN) {memcpy (pm->mac, (*pskb)->mac.raw, in->hard_header_len); pm->mac_len = in->hard_header_len; - } + } else + pm->mac_len = 0;if (in)strncpy (pm->indev_name, in->name,sizeof (pm->indev_name));
Quoted 7 lines · On Sun, Oct 27, 2002 at 10:49:49PM +0100, "Anders K.…
Hello,
I recently startet using the ulogd daemon to log traffic from a PPPoE interface (have used it on regular ethernet interfaces for long). In the resulting logs, the MAC address was filled with (what seemed to be) garbage like the following entry:
Quoted 5 lines
When using the regular LOG target, the MAC field was empty. I traced this back to the
ipt_ulog_targetfunction innet/ipv4/netfilter/ipt_ULOG.cin the kernel, wherepm->mac_lenin theulog_packet_msg_tstruct is left uninitialized, when there is no MAC address.
thanks, I will submit your bugfix soon.
Quoted 2 lines
Regards,
Anders K. Pedersen
Signature · 5 lines
Live long and prosper - Harald Welte / [email protected] http://www.gnumonks.org/ ============================================================================ "If this were a dictatorship, it'd be a heck of a lot easier, just so long as I'm the dictator." -- George W. Bush Dec 18, 2000