diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
tree | e949e0efd019d6f932537aba762792b07a84351c /ipc/sem.c | |
parent | a0a55682b83fd5f012afadcf415b030d7424ae68 (diff) | |
parent | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (diff) |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'ipc/sem.c')
-rw-r--r-- | ipc/sem.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -743,6 +743,8 @@ static unsigned long copy_semid_to_user(void __user *buf, struct semid64_ds *in, | |||
743 | { | 743 | { |
744 | struct semid_ds out; | 744 | struct semid_ds out; |
745 | 745 | ||
746 | memset(&out, 0, sizeof(out)); | ||
747 | |||
746 | ipc64_perm_to_ipc_perm(&in->sem_perm, &out.sem_perm); | 748 | ipc64_perm_to_ipc_perm(&in->sem_perm, &out.sem_perm); |
747 | 749 | ||
748 | out.sem_otime = in->sem_otime; | 750 | out.sem_otime = in->sem_otime; |