Commit 27ae4c7b authored by Harald Welte's avatar Harald Welte Committed by David S. Miller

[NETFILTER]: This patch fixes the ULOG target when logging packets without any

ethernet header (mac address).
parent dc7cf779
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
* module loadtime -HW * module loadtime -HW
* 2002/07/07 remove broken nflog_rcv() function -HW * 2002/07/07 remove broken nflog_rcv() function -HW
* 2002/08/29 fix shifted/unshifted nlgroup bug -HW * 2002/08/29 fix shifted/unshifted nlgroup bug -HW
* 2002/10/30 fix uninitialized mac_len field - <Anders K. Pedersen>
* *
* Released under the terms of the GPL * Released under the terms of the GPL
* *
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
* Specify, after how many clock ticks (intel: 100 per second) the queue * Specify, after how many clock ticks (intel: 100 per second) the queue
* should be flushed even if it is not full yet. * should be flushed even if it is not full yet.
* *
* ipt_ULOG.c,v 1.21 2002/08/29 10:54:34 laforge Exp * ipt_ULOG.c,v 1.22 2002/10/30 09:07:31 laforge Exp
*/ */
#include <linux/module.h> #include <linux/module.h>
...@@ -224,7 +225,8 @@ static unsigned int ipt_ulog_target(struct sk_buff **pskb, ...@@ -224,7 +225,8 @@ static unsigned int ipt_ulog_target(struct sk_buff **pskb,
&& in->hard_header_len <= ULOG_MAC_LEN) { && in->hard_header_len <= ULOG_MAC_LEN) {
memcpy(pm->mac, (*pskb)->mac.raw, in->hard_header_len); memcpy(pm->mac, (*pskb)->mac.raw, in->hard_header_len);
pm->mac_len = in->hard_header_len; pm->mac_len = in->hard_header_len;
} } else
pm->mac_len = 0;
if (in) if (in)
strncpy(pm->indev_name, in->name, sizeof(pm->indev_name)); strncpy(pm->indev_name, in->name, sizeof(pm->indev_name));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment