diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-06-06 22:42:06 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-06 22:42:06 -0700 |
commit | 13fcb7bd322164c67926ffe272846d4860196dc6 (patch) | |
tree | aa7727f84e4ce2a2b1cf758e03d176c62354f44b /include/linux/if_packet.h | |
parent | 79b3891587741dfac72cdfead1f2764b56a567b0 (diff) |
af_packet: prevent information leak
In 2.6.27, commit 393e52e33c6c2 (packet: deliver VLAN TCI to userspace)
added a small information leak.
Add padding field and make sure its zeroed before copy to user.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_packet.h')
-rw-r--r-- | include/linux/if_packet.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h index 6d66ce1791a..7b318630139 100644 --- a/include/linux/if_packet.h +++ b/include/linux/if_packet.h @@ -62,6 +62,7 @@ struct tpacket_auxdata { __u16 tp_mac; __u16 tp_net; __u16 tp_vlan_tci; + __u16 tp_padding; }; /* Rx ring - header status */ @@ -101,6 +102,7 @@ struct tpacket2_hdr { __u32 tp_sec; __u32 tp_nsec; __u16 tp_vlan_tci; + __u16 tp_padding; }; #define TPACKET2_HDRLEN (TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll)) |