sgi-xp: add type cast to kzalloc()'d space to avoid slab corruption
PATCH 1/1 sgi-xp: add type cast to kzalloc()'d space to avoid slab corruption
A missing type cast results in writing way beyond the end of a kzalloc()'d memory segment resulting in slab corruption.
---
drivers/misc/sgi-xp/xpc_uv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/misc/sgi-xp/xpc_uv.c +4 -4
@@ -3,7 +3,7 @@* License. See the file "COPYING" in the main directory of this archive * for more details. * -* Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. +* Copyright (c) 2008-2009 Silicon Graphics, Inc. All Rights Reserved. */ /*
@@ -1129,8 +1129,8 @@ xpc_allocate_recv_msg_slot_uv(struct xpccontinue ;for (entry =0 ; entry < nentries; entry++) { - msg_slot = ch_uv->recv_msg_slots + entry * - ch->entry_size; + msg_slot = (struct xpc_notify_mq_msg_uv *)((u8 *) + ch_uv->recv_msg_slots + entry * ch->entry_size); msg_slot->hdr.msg_slot_number = entry; }
@@ -1438,7 +1438,7 @@ xpc_handle_notify_mq_msg_uv(struct xpc_p/* we're dealing with a normal message sent via the notify_mq */ ch_uv = &ch->sn.uv; - msg_slot = (struct xpc_notify_mq_msg_uv *)((u64 )ch_uv->recv_msg_slots + + msg_slot = (struct xpc_notify_mq_msg_uv *)((u8 *)ch_uv->recv_msg_slots + (msg->hdr.msg_slot_number % ch->remote_nentries) * ch->entry_size);
Quoted 25 lines · On Tue, 3 Feb 2009 12:23:38 -0600 Dean Nelson <[email protected]> wrote:
A missing type cast results in writing way beyond the end of a kzalloc()'d memory segment resulting in slab corruption.
Signed-off-by Dean Nelson <[email protected]>Cc stable <[email protected]>---
drivers/misc/sgi-xp/xpc_uv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)Index:
linux/drivers/misc/sgi-xp/xpc_uv.c
===================================================================drivers/misc/sgi-xp/xpc_uv.c +1
-1@@ -3,7 +3,7 @@* License. See the file "COPYING" in the main directory of this archive * for more details. * -* Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. +* Copyright (c) 2008-2009 Silicon Graphics, Inc. All Rights Reserved. */ /*
drivers/misc/sgi-xp/xpc_uv.c xpc_allocate_recv_msg_slot_uv(struct xpc · line 1133
Quoted 7 lines
drivers/misc/sgi-xp/xpc_uv.c +2
-2@@ -1129,8 +1129,8 @@ xpc_allocate_recv_msg_slot_uv(struct xpccontinue ;for (entry =0 ; entry < nentries; entry++) { - msg_slot = ch_uv->recv_msg_slots + entry * - ch->entry_size; + msg_slot = (struct xpc_notify_mq_msg_uv *)((u8 *) + ch_uv->recv_msg_slots + entry * ch->entry_size);
So.. ch->entry_size is not equal to sizeof(struct xpc_notify_mq_msg_uv)?
Perhaps ->recv_msg_slots should never have had type struct xpc_notify_mq_msg_uv *?
drivers/misc/sgi-xp/xpc_uv.c xpc_handle_notify_mq_msg_uv(struct xpc_p · line 1443
Quoted 10 lines
drivers/misc/sgi-xp/xpc_uv.c +1
-1msg_slot->hdr.msg_slot_number = entry; }@@ -1438,7 +1438,7 @@ xpc_handle_notify_mq_msg_uv(struct xpc_p/* we're dealing with a normal message sent via the notify_mq */ ch_uv = &ch->sn.uv; - msg_slot = (struct xpc_notify_mq_msg_uv *)((u64 )ch_uv->recv_msg_slots + + msg_slot = (struct xpc_notify_mq_msg_uv *)((u8 *)ch_uv->recv_msg_slots + (msg->hdr.msg_slot_number % ch->remote_nentries) * ch->entry_size);
This hunk doesn't change anything?
PATCH 1/1 sgi-xp: fix writing past the end of kzalloc()'d space (v.2)
A missing type cast results in writing way beyond the end of a kzalloc()'d memory segment resulting in slab corruption. But it seems like the better solution is to define ->recv_msg_slots as a 'void *' rather than a 'struct xpc_notify_mq_msg_uv *' and add the type cast.
---
Quoted 5 lines · Andrew Morton
drivers/misc/sgi-xp/xpc_uv.c
Quoted 2 lines · On Tue, 3 Feb 2009 12:23:38 -0600 Dean Nelson <[email protected]> wrote:
drivers/misc/sgi-xp/xpc_uv.c +0
-0
:
Quoted 10 lines
drivers/misc/sgi-xp/xpc_uv.c xpc_allocate_recv_msg_slot_uv(struct xpc · line 1133
Quoted 8 lines
drivers/misc/sgi-xp/xpc_uv.c +2
-2@@ -1129,8 +1129,8 @@ xpc_allocate_recv_msg_slot_uv(struct xpccontinue ;for (entry =0 ; entry < nentries; entry++) { - msg_slot = ch_uv->recv_msg_slots + entry * - ch->entry_size; + msg_slot = (struct xpc_notify_mq_msg_uv *)((u8 *) + ch_uv->recv_msg_slots + entry * ch->entry_size);So..
ch->entry_sizeis not equal tosizeof(struct xpc_notify_mq_msg_uv)?
Correct. The value of ch->entry_size is defined at runtime by the user of XPC (i.e., XPNET and XPMEM) when it calls xpc_connect(). It is always larger than sizeof(struct xpc_notify_mq_msg_uv) which is defined as:
struct xpc_notify_mq_msg_uv {
struct xpc_notify_mq_msghdr_uv hdr;
unsigned long payload;
};The payload field reflects the first eight bytes of the user's payload which extends into the remainder of the messsge slot.
Quoted 2 lines
Perhaps ->recv_msg_slots should never have had type struct
xpc_notify_mq_msg_uv*?
Agreed. So I'm resubmitting the patch based on this recommendation.
Note that I'm using 'void *' instead of 'u8 *' to ->define recv_msg_slots. Currently they are equivalent in terms of the math, but 'void *' has the advantage of not needing to cast at all. Is this an appropriate choice?
Thanks,
Dean
drivers/misc/sgi-xp/xpc.h | 5 +++-- drivers/misc/sgi-xp/xpc_uv.c | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/misc/sgi-xp/xpc.h +3 -2
@@ -3,7 +3,7 @@* License. See the file "COPYING" in the main directory of this archive * for more details. * -* Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved. +* Copyright (c) 2004-2009 Silicon Graphics, Inc. All Rights Reserved. */ /*
@@ -519,7 +519,8 @@ struct xpc_channel_uv {/* gru mq descriptor */ struct xpc_send_msg_slot_uv *send_msg_slots; -struct xpc_notify_mq_msg_uv *recv_msg_slots; +void *recv_msg_slots;/* each slot will hold a xpc_notify_mq_msg_uv */ +/* structure plus the user's payload */ struct xpc_fifo_head_uv msg_slot_free_list;struct xpc_fifo_head_uv recv_msg_list;/* deliverable payloads */
drivers/misc/sgi-xp/xpc_uv.c +5 -6
@@ -3,7 +3,7 @@* License. See the file "COPYING" in the main directory of this archive * for more details. * -* Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. +* Copyright (c) 2008-2009 Silicon Graphics, Inc. All Rights Reserved. */ /*
@@ -1129,8 +1129,8 @@ xpc_allocate_recv_msg_slot_uv(struct xpccontinue ;for (entry =0 ; entry < nentries; entry++) { - msg_slot = ch_uv->recv_msg_slots + entry * - ch->entry_size; + msg_slot = ch_uv->recv_msg_slots + + entry * ch->entry_size; msg_slot->hdr.msg_slot_number = entry; }
@@ -1438,9 +1438,8 @@ xpc_handle_notify_mq_msg_uv(struct xpc_p/* we're dealing with a normal message sent via the notify_mq */ ch_uv = &ch->sn.uv; - msg_slot = (struct xpc_notify_mq_msg_uv *)((u64 )ch_uv->recv_msg_slots + - (msg->hdr.msg_slot_number % ch->remote_nentries) * - ch->entry_size); + msg_slot = ch_uv->recv_msg_slots + + (msg->hdr.msg_slot_number % ch->remote_nentries) * ch->entry_size;BUG_ON (msg->hdr.msg_slot_number != msg_slot->hdr.msg_slot_number);BUG_ON (msg_slot->hdr.size !=0 );
Re: [PATCH] sgi-xp: fix writing past the end of kzalloc()'d space (v.2)
Quoted 3 lines · On Wed, 4 Feb 2009 12:36:41 -0600 Dean Nelson <[email protected]> wrote:
Note that I'm using 'void *' instead of 'u8 *' to ->define
recv_msg_slots. Currently they are equivalent in terms of the math, but 'void *' has the advantage of not needing to cast at all. Is this an appropriate choice?
I think so. void* is a nice way of saying "here's a blob of bytes". It's a gcc extension to permit arithmetic on a void*, but we use that one widely.