* [PATCH] ipv4: Fix ip_getsockopt for IP_PKTOPTIONS
@ 2011-08-06 23:20 Daniel Baluta
2011-08-08 5:31 ` David Miller
2011-08-09 8:24 ` Jean Sacren
0 siblings, 2 replies; 4+ messages in thread
From: Daniel Baluta @ 2011-08-06 23:20 UTC (permalink / raw)
To: davem, kuznet, pekkas, yoshfuji, kaber
Cc: netdev, Daniel Baluta, Tiberiu Szocs-Mihai
IP_PKTOPTIONS is broken for 32-bit applications running
in COMPAT mode on 64-bit kernels.
This happens because msghdr's msg_flags field is always
set to zero. When running in COMPAT mode this should be
set to MSG_CMSG_COMPAT instead.
Signed-off-by: Tiberiu Szocs-Mihai <tszocs@ixiacom.com>
Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com>
---
net/ipv4/ip_sockglue.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index ab0c9ef..c77f5a8 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -1067,7 +1067,7 @@ EXPORT_SYMBOL(compat_ip_setsockopt);
*/
static int do_ip_getsockopt(struct sock *sk, int level, int optname,
- char __user *optval, int __user *optlen)
+ char __user *optval, int __user *optlen, unsigned flags)
{
struct inet_sock *inet = inet_sk(sk);
int val;
@@ -1240,7 +1240,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
msg.msg_control = optval;
msg.msg_controllen = len;
- msg.msg_flags = 0;
+ msg.msg_flags = flags;
if (inet->cmsg_flags & IP_CMSG_PKTINFO) {
struct in_pktinfo info;
@@ -1294,7 +1294,7 @@ int ip_getsockopt(struct sock *sk, int level,
{
int err;
- err = do_ip_getsockopt(sk, level, optname, optval, optlen);
+ err = do_ip_getsockopt(sk, level, optname, optval, optlen, 0);
#ifdef CONFIG_NETFILTER
/* we need to exclude all possible ENOPROTOOPTs except default case */
if (err == -ENOPROTOOPT && optname != IP_PKTOPTIONS &&
@@ -1327,7 +1327,8 @@ int compat_ip_getsockopt(struct sock *sk, int level, int optname,
return compat_mc_getsockopt(sk, level, optname, optval, optlen,
ip_getsockopt);
- err = do_ip_getsockopt(sk, level, optname, optval, optlen);
+ err = do_ip_getsockopt(sk, level, optname, optval, optlen,
+ MSG_CMSG_COMPAT);
#ifdef CONFIG_NETFILTER
/* we need to exclude all possible ENOPROTOOPTs except default case */
--
1.7.2.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ipv4: Fix ip_getsockopt for IP_PKTOPTIONS
2011-08-06 23:20 [PATCH] ipv4: Fix ip_getsockopt for IP_PKTOPTIONS Daniel Baluta
@ 2011-08-08 5:31 ` David Miller
2011-08-09 8:24 ` Jean Sacren
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2011-08-08 5:31 UTC (permalink / raw)
To: dbaluta; +Cc: kuznet, pekkas, yoshfuji, kaber, netdev, tszocs
From: Daniel Baluta <dbaluta@ixiacom.com>
Date: Sun, 7 Aug 2011 02:20:50 +0300
> IP_PKTOPTIONS is broken for 32-bit applications running
> in COMPAT mode on 64-bit kernels.
>
> This happens because msghdr's msg_flags field is always
> set to zero. When running in COMPAT mode this should be
> set to MSG_CMSG_COMPAT instead.
>
> Signed-off-by: Tiberiu Szocs-Mihai <tszocs@ixiacom.com>
> Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ipv4: Fix ip_getsockopt for IP_PKTOPTIONS
2011-08-06 23:20 [PATCH] ipv4: Fix ip_getsockopt for IP_PKTOPTIONS Daniel Baluta
2011-08-08 5:31 ` David Miller
@ 2011-08-09 8:24 ` Jean Sacren
2011-08-09 8:41 ` Tiberiu Szocs-Mihai
1 sibling, 1 reply; 4+ messages in thread
From: Jean Sacren @ 2011-08-09 8:24 UTC (permalink / raw)
To: Daniel Baluta; +Cc: David S. Miller, tszocs, Linux Networking
From: Daniel Baluta <dbaluta@ixiacom.com>
Date: Sun, 07 Aug 2011 02:20:50 +0300
>
> IP_PKTOPTIONS is broken for 32-bit applications running
> in COMPAT mode on 64-bit kernels.
>
> This happens because msghdr's msg_flags field is always
> set to zero. When running in COMPAT mode this should be
> set to MSG_CMSG_COMPAT instead.
>
> Signed-off-by: Tiberiu Szocs-Mihai <tszocs@ixiacom.com>
> Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com>
> ---
> net/ipv4/ip_sockglue.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
> index ab0c9ef..c77f5a8 100644
> --- a/net/ipv4/ip_sockglue.c
> +++ b/net/ipv4/ip_sockglue.c
> @@ -1067,7 +1067,7 @@ EXPORT_SYMBOL(compat_ip_setsockopt);
> */
>
> static int do_ip_getsockopt(struct sock *sk, int level, int optname,
> - char __user *optval, int __user *optlen)
> + char __user *optval, int __user *optlen, unsigned flags)
> {
> struct inet_sock *inet = inet_sk(sk);
> int val;
> @@ -1240,7 +1240,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
>
> msg.msg_control = optval;
> msg.msg_controllen = len;
> - msg.msg_flags = 0;
> + msg.msg_flags = flags;
>
> if (inet->cmsg_flags & IP_CMSG_PKTINFO) {
> struct in_pktinfo info;
> @@ -1294,7 +1294,7 @@ int ip_getsockopt(struct sock *sk, int level,
> {
> int err;
>
> - err = do_ip_getsockopt(sk, level, optname, optval, optlen);
> + err = do_ip_getsockopt(sk, level, optname, optval, optlen, 0);
> #ifdef CONFIG_NETFILTER
> /* we need to exclude all possible ENOPROTOOPTs except default case */
> if (err == -ENOPROTOOPT && optname != IP_PKTOPTIONS &&
> @@ -1327,7 +1327,8 @@ int compat_ip_getsockopt(struct sock *sk, int level, int optname,
> return compat_mc_getsockopt(sk, level, optname, optval, optlen,
> ip_getsockopt);
>
> - err = do_ip_getsockopt(sk, level, optname, optval, optlen);
> + err = do_ip_getsockopt(sk, level, optname, optval, optlen,
> + MSG_CMSG_COMPAT);
>
> #ifdef CONFIG_NETFILTER
> /* we need to exclude all possible ENOPROTOOPTs except default case */
> --
> 1.7.2.5
I think the original patch can be simplified. Feedback is greatly
appreciated.
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index ab0c9ef..f6eed68 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -1240,7 +1240,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
msg.msg_control = optval;
msg.msg_controllen = len;
- msg.msg_flags = 0;
+ msg.msg_flags = MSG_CMSG_COMPAT;
if (inet->cmsg_flags & IP_CMSG_PKTINFO) {
struct in_pktinfo info;
--
Jean Sacren
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ipv4: Fix ip_getsockopt for IP_PKTOPTIONS
2011-08-09 8:24 ` Jean Sacren
@ 2011-08-09 8:41 ` Tiberiu Szocs-Mihai
0 siblings, 0 replies; 4+ messages in thread
From: Tiberiu Szocs-Mihai @ 2011-08-09 8:41 UTC (permalink / raw)
To: Jean Sacren; +Cc: Daniel Baluta, David S. Miller, Linux Networking
Hi Jean,
That was my first variant of the patch, but that way the code does more than
it's suppose to do: the call of do_ip_getsockopt becomes unaware of the
context from which it is called (ip_getsockopt or compat_ip_getsockopt). We
should act in a compat manner only when called from compat_ip_getsockopt.
The issue that needed a fix was that in compat mode the flag was set to 0 thus
silently disabling the call of put_cmsg_compat (see net/core/scm.c).
Thanks for the review,
Tiberiu
On Tuesday, August 09, 2011 11:24:04 am Jean Sacren wrote:
> From: Daniel Baluta <dbaluta@ixiacom.com>
> Date: Sun, 07 Aug 2011 02:20:50 +0300
>
> > IP_PKTOPTIONS is broken for 32-bit applications running
> > in COMPAT mode on 64-bit kernels.
> >
> > This happens because msghdr's msg_flags field is always
> > set to zero. When running in COMPAT mode this should be
> > set to MSG_CMSG_COMPAT instead.
> >
> > Signed-off-by: Tiberiu Szocs-Mihai <tszocs@ixiacom.com>
> > Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com>
> > ---
> >
> > net/ipv4/ip_sockglue.c | 9 +++++----
> > 1 files changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
> > index ab0c9ef..c77f5a8 100644
> > --- a/net/ipv4/ip_sockglue.c
> > +++ b/net/ipv4/ip_sockglue.c
> > @@ -1067,7 +1067,7 @@ EXPORT_SYMBOL(compat_ip_setsockopt);
> >
> > */
> >
> > static int do_ip_getsockopt(struct sock *sk, int level, int optname,
> >
> > - char __user *optval, int __user *optlen)
> > + char __user *optval, int __user *optlen, unsigned flags)
> >
> > {
> >
> > struct inet_sock *inet = inet_sk(sk);
> > int val;
> >
> > @@ -1240,7 +1240,7 @@ static int do_ip_getsockopt(struct sock *sk, int
> > level, int optname,
> >
> > msg.msg_control = optval;
> > msg.msg_controllen = len;
> >
> > - msg.msg_flags = 0;
> > + msg.msg_flags = flags;
> >
> > if (inet->cmsg_flags & IP_CMSG_PKTINFO) {
> >
> > struct in_pktinfo info;
> >
> > @@ -1294,7 +1294,7 @@ int ip_getsockopt(struct sock *sk, int level,
> >
> > {
> >
> > int err;
> >
> > - err = do_ip_getsockopt(sk, level, optname, optval, optlen);
> > + err = do_ip_getsockopt(sk, level, optname, optval, optlen, 0);
> >
> > #ifdef CONFIG_NETFILTER
> >
> > /* we need to exclude all possible ENOPROTOOPTs except default case
*/
> > if (err == -ENOPROTOOPT && optname != IP_PKTOPTIONS &&
> >
> > @@ -1327,7 +1327,8 @@ int compat_ip_getsockopt(struct sock *sk, int
> > level, int optname,
> >
> > return compat_mc_getsockopt(sk, level, optname, optval, optlen,
> >
> > ip_getsockopt);
> >
> > - err = do_ip_getsockopt(sk, level, optname, optval, optlen);
> > + err = do_ip_getsockopt(sk, level, optname, optval, optlen,
> > + MSG_CMSG_COMPAT);
> >
> > #ifdef CONFIG_NETFILTER
> >
> > /* we need to exclude all possible ENOPROTOOPTs except default case
*/
>
> I think the original patch can be simplified. Feedback is greatly
> appreciated.
>
> diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
> index ab0c9ef..f6eed68 100644
> --- a/net/ipv4/ip_sockglue.c
> +++ b/net/ipv4/ip_sockglue.c
> @@ -1240,7 +1240,7 @@ static int do_ip_getsockopt(struct sock *sk, int
> level, int optname,
>
> msg.msg_control = optval;
> msg.msg_controllen = len;
> - msg.msg_flags = 0;
> + msg.msg_flags = MSG_CMSG_COMPAT;
>
> if (inet->cmsg_flags & IP_CMSG_PKTINFO) {
> struct in_pktinfo info;
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-09 8:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-06 23:20 [PATCH] ipv4: Fix ip_getsockopt for IP_PKTOPTIONS Daniel Baluta
2011-08-08 5:31 ` David Miller
2011-08-09 8:24 ` Jean Sacren
2011-08-09 8:41 ` Tiberiu Szocs-Mihai
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).