Re: problem with conntrack utility and kernel 2.6.14

[Pablo Neira <pablo@eurodev.net>]

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

Hi,

Deti Fliegl wrote:
> Thanks for the patch (which seemed to be already checked into svn) - 
> conntrack now works properly - no seg faults occured :)

Could you give a try to the patch attached and tell me if it fixes the 
problem as well?

> The kernel oops still happens - but this time I had access to the 
> console (hope that helps):

Thanks a lot for the report, I'll have a look at it asap.

-- 
Pablo

[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1900 bytes --]

Index: libnfnetlink/include/libnfnetlink/libnfnetlink.h
===================================================================
--- libnfnetlink/include/libnfnetlink/libnfnetlink.h	(revision 4394)
+++ libnfnetlink/include/libnfnetlink/libnfnetlink.h	(working copy)
@@ -18,8 +21,8 @@
 #define NLMSG_TAIL(nlh) \
 	(((void *) (nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len))
 
-#define NFNL_HEADER_LEN	(NLMSG_LENGTH(sizeof(struct nlmsghdr))	\
-			 +NLMSG_LENGTH(sizeof(struct nfgenmsg)))
+#define NFNL_HEADER_LEN	(NLMSG_ALIGN(sizeof(struct nlmsghdr))	\
+			 +NLMSG_ALIGN(sizeof(struct nfgenmsg)))
 
 #define NFNL_BUFFSIZE		8192
 
Index: libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- libnetfilter_conntrack/src/libnetfilter_conntrack.c	(revision 4398)
+++ libnetfilter_conntrack/src/libnetfilter_conntrack.c	(working copy)
@@ -433,7 +433,7 @@
 {
 	struct nfgenmsg *nfmsg;
 	struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
-	int attrlen = NLMSG_LENGTH(nlh->nlmsg_len) - NFNL_HEADER_LEN;
+	int attrlen = nlh->nlmsg_len - NFNL_HEADER_LEN;
 	struct nfct_conntrack ct;
 	unsigned int flags = 0;
 	int type = NFNL_MSG_TYPE(nlh->nlmsg_type), ret = 0;
@@ -442,7 +442,7 @@
 
 	nfmsg = NLMSG_DATA(nlh);
 
-	if (NLMSG_LENGTH(nlh->nlmsg_len) < NFNL_HEADER_LEN)
+	if (nlh->nlmsg_len < NFNL_HEADER_LEN)
 		return -EINVAL;
 
 	while (NFA_OK(attr, attrlen)) {
@@ -674,7 +674,7 @@
 {
 	struct nfgenmsg *nfmsg;
 	struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
-	int attrlen = NLMSG_LENGTH(nlh->nlmsg_len) - NFNL_HEADER_LEN;
+	int attrlen = nlh->nlmsg_len - NFNL_HEADER_LEN;
 	struct nfct_expect exp;
 	int type = NFNL_MSG_TYPE(nlh->nlmsg_type), ret = 0;
 
@@ -682,7 +682,7 @@
 
 	nfmsg = NLMSG_DATA(nlh);
 
-	if (NLMSG_LENGTH(nlh->nlmsg_len) < NFNL_HEADER_LEN)
+	if (nlh->nlmsg_len < NFNL_HEADER_LEN)
 		return -EINVAL;
 
 	while (NFA_OK(attr, attrlen)) {