From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Netfilter Development Mailinglist <netfilter-devel@lists.netfilter.org>
Cc: Harald Welte <laforge@netfilter.org>, Patrick McHardy <kaber@trash.net>
Subject: [PATCH 3/4] nfqueue message is on a diet
Date: Mon, 13 Feb 2006 03:41:48 +0100 [thread overview]
Message-ID: <43EFF1EC.2070701@netfilter.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
[NFNETLINK_QUEUE] nfqueue message is on a diet
Fix oversized message, use NLMSG_SPACE just one since it reserves space
for the netlink header.
Sign-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--
The dawn of the fourth age of Linux firewalling is coming; a time of
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris
[-- Attachment #2: nfqueue.patch --]
[-- Type: text/plain, Size: 1597 bytes --]
[NFNETLINK_QUEUE] nfqueue message is on a diet
Fix oversized message, use NLMSG_SPACE just one since it reserves space
for the netlink header.
Sign-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Index: net-2.6.git/net/netfilter/nfnetlink_queue.c
===================================================================
--- net-2.6.git.orig/net/netfilter/nfnetlink_queue.c 2006-02-09 17:34:01.000000000 +0100
+++ net-2.6.git/net/netfilter/nfnetlink_queue.c 2006-02-13 01:10:12.000000000 +0100
@@ -354,16 +354,17 @@ nfqnl_build_packet_message(struct nfqnl_
QDEBUG("entered\n");
/* all macros expand to constant values at compile time */
- size = NLMSG_SPACE(sizeof(struct nfqnl_msg_packet_hdr))
- + NLMSG_SPACE(sizeof(u_int32_t)) /* ifindex */
- + NLMSG_SPACE(sizeof(u_int32_t)) /* ifindex */
+ size = NLMSG_SPACE(sizeof(struct nfgenmsg))
+ + NLMSG_ALIGN(sizeof(struct nfqnl_msg_packet_hdr))
+ + NLMSG_ALIGN(sizeof(u_int32_t)) /* ifindex */
+ + NLMSG_ALIGN(sizeof(u_int32_t)) /* ifindex */
#ifdef CONFIG_BRIDGE_NETFILTER
- + NLMSG_SPACE(sizeof(u_int32_t)) /* ifindex */
- + NLMSG_SPACE(sizeof(u_int32_t)) /* ifindex */
+ + NLMSG_ALIGN(sizeof(u_int32_t)) /* ifindex */
+ + NLMSG_ALIGN(sizeof(u_int32_t)) /* ifindex */
#endif
- + NLMSG_SPACE(sizeof(u_int32_t)) /* mark */
- + NLMSG_SPACE(sizeof(struct nfqnl_msg_packet_hw))
- + NLMSG_SPACE(sizeof(struct nfqnl_msg_packet_timestamp));
+ + NLMSG_ALIGN(sizeof(u_int32_t)) /* mark */
+ + NLMSG_ALIGN(sizeof(struct nfqnl_msg_packet_hw))
+ + NLMSG_ALIGN(sizeof(struct nfqnl_msg_packet_timestamp));
outdev = entinf->outdev;
next reply other threads:[~2006-02-13 2:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-13 2:41 Pablo Neira Ayuso [this message]
2006-02-13 11:19 ` [PATCH 3/4] nfqueue message is on a diet Harald Welte
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43EFF1EC.2070701@netfilter.org \
--to=pablo@netfilter.org \
--cc=kaber@trash.net \
--cc=laforge@netfilter.org \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.