From: Andrew Morton <akpm@osdl.org>
To: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Cc: davem@davemloft.net, netdev@oss.sgi.com,
James.Bottomley@HansenPartnership.com
Subject: Re: [IPV6] fix inet6_sk for non IPV6 builds
Date: Thu, 30 Dec 2004 00:21:15 -0800 [thread overview]
Message-ID: <20041230002115.67c0dbbf.akpm@osdl.org> (raw)
In-Reply-To: <41D3306F.7080605@conectiva.com.br>
Arnaldo Carvalho de Melo <acme@conectiva.com.br> wrote:
>
> Please apply this patch, the problem was noted by James Bottomley, that
> doesn't enables CONFIG_IPV6.
>
> Signed-off-by: Arnaldo Carvalho de Melo
>
> - Arnaldo
>
>
> [inet6_sk.patch text/plain (787 bytes)]
> ===== include/linux/ipv6.h 1.23 vs edited =====
> --- 1.23/include/linux/ipv6.h 2004-12-27 23:56:33 -02:00
> +++ edited/include/linux/ipv6.h 2004-12-29 20:22:45 -02:00
> @@ -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
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:
--- 25/include/linux/ipv6.h~fix-inet6_sk-for-non-ipv6-builds 2004-12-30 00:19:06.550680488 -0800
+++ 25-akpm/include/linux/ipv6.h 2004-12-30 00:20:30.386935440 -0800
@@ -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
_
prev parent reply other threads:[~2004-12-30 8:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-29 22:32 [IPV6] fix inet6_sk for non IPV6 builds Arnaldo Carvalho de Melo
2004-12-30 8:21 ` Andrew Morton [this message]
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=20041230002115.67c0dbbf.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=acme@conectiva.com.br \
--cc=davem@davemloft.net \
--cc=netdev@oss.sgi.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).