git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...
[pandora-kernel.git]
/
ipc
/
compat.c
diff --git
a/ipc/compat.c
b/ipc/compat.c
index
9dc2c7d
..
845a287
100644
(file)
--- a/
ipc/compat.c
+++ b/
ipc/compat.c
@@
-241,6
+241,8
@@
long compat_sys_semctl(int first, int second, int third, void __user *uptr)
struct semid64_ds __user *up64;
int version = compat_ipc_parse_version(&third);
struct semid64_ds __user *up64;
int version = compat_ipc_parse_version(&third);
+ memset(&s64, 0, sizeof(s64));
+
if (!uptr)
return -EINVAL;
if (get_user(pad, (u32 __user *) uptr))
if (!uptr)
return -EINVAL;
if (get_user(pad, (u32 __user *) uptr))
@@
-421,6
+423,8
@@
long compat_sys_msgctl(int first, int second, void __user *uptr)
int version = compat_ipc_parse_version(&second);
void __user *p;
int version = compat_ipc_parse_version(&second);
void __user *p;
+ memset(&m64, 0, sizeof(m64));
+
switch (second & (~IPC_64)) {
case IPC_INFO:
case IPC_RMID:
switch (second & (~IPC_64)) {
case IPC_INFO:
case IPC_RMID:
@@
-594,6
+598,8
@@
long compat_sys_shmctl(int first, int second, void __user *uptr)
int err, err2;
int version = compat_ipc_parse_version(&second);
int err, err2;
int version = compat_ipc_parse_version(&second);
+ memset(&s64, 0, sizeof(s64));
+
switch (second & (~IPC_64)) {
case IPC_RMID:
case SHM_LOCK:
switch (second & (~IPC_64)) {
case IPC_RMID:
case SHM_LOCK: