diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-08 18:05:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-08 18:05:42 -0500 |
commit | 59d8e5eb2bd5593d8220db0e25206cdfc42e83ea (patch) | |
tree | 5a11524581ff040f2c335fc6a318ff54f100552c /ipc/msgutil.c | |
parent | c4c5ff09872751eeb412e3e1af484955529426a1 (diff) | |
parent | c3d6b628395fe6ec3442a83ddf02334c54867d43 (diff) |
Merge branch 'akpm' (fixes from Andrew)
Merge misc fixes from Andrew Morton.
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
alpha: boot: fix build breakage introduced by system.h disintegration
memcg: initialize kmem-cache destroying work earlier
Randy has moved
ksm: fix m68k build: only NUMA needs pfn_to_nid
dmi_scan: fix missing check for _DMI_ signature in smbios_present()
Revert parts of "hlist: drop the node parameter from iterators"
idr: remove WARN_ON_ONCE() on negative IDs
mm/mempolicy.c: fix sp_node_init() argument ordering
mm/mempolicy.c: fix wrong sp_node insertion
ipc: don't allocate a copy larger than max
ipc: fix potential oops when src msg > 4k w/ MSG_COPY
Diffstat (limited to 'ipc/msgutil.c')
-rw-r--r-- | ipc/msgutil.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ipc/msgutil.c b/ipc/msgutil.c index ebfcbfa8b7f2..5df8e4bf1db0 100644 --- a/ipc/msgutil.c +++ b/ipc/msgutil.c | |||
@@ -117,9 +117,6 @@ struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst) | |||
117 | if (alen > DATALEN_MSG) | 117 | if (alen > DATALEN_MSG) |
118 | alen = DATALEN_MSG; | 118 | alen = DATALEN_MSG; |
119 | 119 | ||
120 | dst->next = NULL; | ||
121 | dst->security = NULL; | ||
122 | |||
123 | memcpy(dst + 1, src + 1, alen); | 120 | memcpy(dst + 1, src + 1, alen); |
124 | 121 | ||
125 | len -= alen; | 122 | len -= alen; |