netdev - [PATCH] NETLINK: convert NLMSG_GOODSIZE to constant expression.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20070307.163401.110957772.yoshfuji@linux-ipv6.org>
Date:	Wed, 07 Mar 2007 16:34:01 +0900 (JST)
From:	YOSHIFUJI Hideaki / 吉藤英明 
	<yoshfuji@...ux-ipv6.org>
To:	davem@...emloft.net
Cc:	yoshfuji@...ux-ipv6.org, netdev@...r.kernel.org
Subject: [PATCH] NETLINK: convert NLMSG_GOODSIZE to constant expression.

This fixes the following error:
:
|  CC [M]  net/ipv4/netfilter/ipt_ULOG.o
|net/ipv4/netfilter/ipt_ULOG.c:82: error: braced-group within expression allowed only inside a function
|net/ipv4/netfilter/ipt_ULOG.c:82: error: syntax error before "void"
|make[1]: *** [net/ipv4/netfilter/ipt_ULOG.o] Error 1
|make: *** [net/ipv4/netfilter/] Error 2

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@...ux-ipv6.org>

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 54597e4..a9d3ad5 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -175,8 +175,12 @@ int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol);
  *	use enormous buffer sizes on recvmsg() calls just to avoid
  *	MSG_TRUNC when PAGE_SIZE is very large.
  */
-#define NLMSG_GOODSIZE	\
-	SKB_WITH_OVERHEAD(min(PAGE_SIZE,8192UL))
+#if PAGE_SIZE < 8192UL
+#define NLMSG_GOODSIZE	SKB_WITH_OVERHEAD(PAGE_SIZE)
+#else
+#define NLMSG_GOODSIZE	SKB_WITH_OVERHEAD(8192UL)
+#endif
+
 #define NLMSG_DEFAULT_SIZE (NLMSG_GOODSIZE - NLMSG_HDRLEN)
 
 

-- 
YOSHIFUJI Hideaki @ USAGI Project  <yoshfuji@...ux-ipv6.org>
GPG-FP  : 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html