diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-05-27 15:49:11 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-05-27 15:49:11 +0200 |
| commit | eeff9beec3d2563c42cca41e66d4169592bb5475 (patch) | |
| tree | d727bae7008d9ec4a412f2aebc3bfd9f485c6f01 /net | |
| parent | 683a04cebc63819a36b1db19843bd17771f05b55 (diff) | |
| download | linux-3.10-eeff9beec3d2563c42cca41e66d4169592bb5475.tar.gz linux-3.10-eeff9beec3d2563c42cca41e66d4169592bb5475.tar.bz2 linux-3.10-eeff9beec3d2563c42cca41e66d4169592bb5475.zip | |
netfilter: nfnetlink_log: fix wrong skbuff size calculation
This problem was introduced in 72961ecf84d67d6359a1b30f9b2a8427f13e1e71
since no space was reserved for the new attributes NFULA_HWTYPE,
NFULA_HWLEN and NFULA_HWHEADER.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nfnetlink_log.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index fd326ac27ec..66a6dd5c519 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -581,6 +581,12 @@ nfulnl_log_packet(u_int8_t pf, + nla_total_size(sizeof(struct nfulnl_msg_packet_hw)) + nla_total_size(sizeof(struct nfulnl_msg_packet_timestamp)); + if (in && skb_mac_header_was_set(skb)) { + size += nla_total_size(skb->dev->hard_header_len) + + nla_total_size(sizeof(u_int16_t)) /* hwtype */ + + nla_total_size(sizeof(u_int16_t)); /* hwlen */ + } + spin_lock_bh(&inst->lock); if (inst->flags & NFULNL_CFG_F_SEQ) |