fix inet6_sk for non IPV6 builds
Subsystems (2)
Hi David,
Please apply this patch, the problem was noted by James Bottomley, that
doesn't enables CONFIG_IPV6.
- Arnaldo
===== include/linux/ipv6.h 1.23 vs edited =====
include/linux/ipv6.h +1 -1
@@ -273,6 +273,7 @@struct ipv6_pinfo inet6; }; +#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE )static inline struct ipv6_pinfo *inet6_sk (const struct sock *__sk) {return inet_sk (__sk)->pinet6;
@@ -283,7 +284,6 @@ return &((struct raw6_sock *)__sk)->raw6; } -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE )#define __ipv6_only_sock (sk) (inet6_sk(sk)->ipv6only)#define ipv6_only_sock (sk) ((sk)->sk_family == PF_INET6 && __ipv6_only_sock(sk))#else
Quoted 25 lines · Arnaldo Carvalho de Melo
Please apply this patch, the problem was noted by James Bottomley, that
doesn't enablesCONFIG_IPV6.Signed-off-by Arnaldo Carvalho de Melo- Arnaldo
[inet6_sk.patch text/plain (787 bytes)]
=====include/linux/ipv6.h1.23 vs edited =====
---1.23/include/linux/ipv6.h2004-12-27 23:56:33 -02:00
+++edited/include/linux/ipv6.h2004-12-29 20:22:45 -02:00
@@ -273,6 +273,7 @@
structipv6_pinfoinet6;
};+#if
defined(CONFIG_IPV6)||defined(CONFIG_IPV6_MODULE)
static inline structipv6_pinfo*inet6_sk(const struct sock *__sk){
return inet_sk(__sk)->pinet6;
@@ -283,7 +284,6 @@
return &((structraw6_sock*)__sk)->raw6;
}
Quoted 4 lines
-#if
defined(CONFIG_IPV6)||defined(CONFIG_IPV6_MODULE)
#define__ipv6_only_sock(sk)(inet6_sk(sk)->ipv6only)
#defineipv6_only_sock(sk)((sk)->sk_family ==PF_INET6&&__ipv6_only_sock(sk))
#else
This breaks selinux:
security/selinux/avc.c: In function `avc_audit':security/selinux/avc.c:640: warning: implicit declaration of function `inet6_sk' security/selinux/avc.c:640: warning: initialization makes pointer from integer w
This is hastily tested:
include/linux/ipv6.h renamed from include/linux/ipv6.h~fix-inet6_sk-for-non-ipv6-builds +12 -1
@@ -273,6 +273,7 @@ struct tcp6_sock {struct ipv6_pinfo inet6; }; +#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE )static inline struct ipv6_pinfo *inet6_sk (const struct sock *__sk) {return inet_sk (__sk)->pinet6;
@@ -283,10 +284,20 @@ static inline struct raw6_opt * raw6_sk( return &((struct raw6_sock *)__sk)->raw6; } -#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE )#define __ipv6_only_sock (sk) (inet6_sk(sk)->ipv6only)#define ipv6_only_sock (sk) ((sk)->sk_family == PF_INET6 && __ipv6_only_sock(sk))#else + +static inline struct ipv6_pinfo *inet6_sk (const struct sock *__sk) +{ +return NULL ; +} + +static inline struct raw6_opt *raw6_sk (const struct sock *__sk) +{ +return NULL ; +} +#define __ipv6_only_sock (sk) 0#define ipv6_only_sock (sk) 0#endif
_