Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 361916a9 authored by Dean Nelson's avatar Dean Nelson Committed by Linus Torvalds
Browse files

sgi-xp: fix writing past the end of kzalloc()'d space 



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.

Signed-off-by: default avatarDean Nelson <dcn@sgi.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fb9a6800

drivers/misc/sgi-xp/xpc.h

+3 −2
Original line number Diff line number Diff line
@@ -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.

 */



/*
@@ -514,7 +514,8 @@ struct xpc_channel_uv { 
						/* partition's notify mq */



	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
Original line number Diff line number Diff line
@@ -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.

 */



/*
@@ -1010,8 +1010,8 @@ xpc_allocate_recv_msg_slot_uv(struct xpc_channel *ch) 
			continue;



		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;

		}
@@ -1308,9 +1308,8 @@ xpc_handle_notify_mq_msg_uv(struct xpc_partition *part, 
	/* 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);