diff options
| author | Jesper Juhl <jj@chaosbits.net> | 2012-07-22 11:37:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-22 17:50:49 -0700 |
| commit | 818810472b129004c16fc51bf0a570b60776bfb7 (patch) | |
| tree | 132cc06300eee66d5e29905a652e79bf585416f6 /net/compat.c | |
| parent | 5e9965c15ba88319500284e590733f4a4629a288 (diff) | |
| download | linux-stable-818810472b129004c16fc51bf0a570b60776bfb7.tar.gz linux-stable-818810472b129004c16fc51bf0a570b60776bfb7.tar.bz2 linux-stable-818810472b129004c16fc51bf0a570b60776bfb7.zip | |
net: Fix references to out-of-scope variables in put_cmsg_compat()
In net/compat.c::put_cmsg_compat() we may assign 'data' the address of
either the 'ctv' or 'cts' local variables inside the 'if
(!COMPAT_USE_64BIT_TIME)' branch.
Those variables go out of scope at the end of the 'if' statement, so
when we use 'data' further down in 'copy_to_user(CMSG_COMPAT_DATA(cm),
data, cmlen - sizeof(struct compat_cmsghdr))' there's no telling what
it may be refering to - not good.
Fix the problem by simply giving 'ctv' and 'cts' function scope.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/compat.c')
| -rw-r--r-- | net/compat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/compat.c b/net/compat.c index 1b96281892de..74ed1d7a84a2 100644 --- a/net/compat.c +++ b/net/compat.c @@ -221,6 +221,8 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat { struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control; struct compat_cmsghdr cmhdr; + struct compat_timeval ctv; + struct compat_timespec cts[3]; int cmlen; if (cm == NULL || kmsg->msg_controllen < sizeof(*cm)) { @@ -229,8 +231,6 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat } if (!COMPAT_USE_64BIT_TIME) { - struct compat_timeval ctv; - struct compat_timespec cts[3]; if (level == SOL_SOCKET && type == SCM_TIMESTAMP) { struct timeval *tv = (struct timeval *)data; ctv.tv_sec = tv->tv_sec; |