diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-10-12 23:38:02 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-10-12 23:38:02 -0400 |
| commit | 492c032beccd53f807811b6c14909630d409dd8c (patch) | |
| tree | 208550c6ccecb8f1b4f85edb91702ca2bdef855e /ipc | |
| parent | f9d629c737cb6687216a0c540b5466a4bd8b070a (diff) | |
| parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) | |
Merge commit 'v2.6.36-rc7' into spi/next
Diffstat (limited to 'ipc')
| -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; |
