From: Robin Holt If the bte copy fails, the attempt to retrieve payloads merely returns a null pointer deref and not NULL as was expected. Signed-off-by: Robin Holt Signed-off-by: Dean Nelson Cc: --- drivers/misc/sgi-xp/xpc_sn2.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Index: xpc-fixes-20090115/drivers/misc/sgi-xp/xpc_sn2.c =================================================================== --- xpc-fixes-20090115.orig/drivers/misc/sgi-xp/xpc_sn2.c 2009-01-15 10:21:56.024557255 -0600 +++ xpc-fixes-20090115/drivers/misc/sgi-xp/xpc_sn2.c 2009-01-15 10:50:00.953033142 -0600 @@ -1957,11 +1957,13 @@ xpc_get_deliverable_payload_sn2(struct x msg = xpc_pull_remote_msg_sn2(ch, get); - DBUG_ON(msg != NULL && msg->number != get); - DBUG_ON(msg != NULL && (msg->flags & XPC_M_SN2_DONE)); - DBUG_ON(msg != NULL && !(msg->flags & XPC_M_SN2_READY)); + if (msg != NULL) { + DBUG_ON(msg->number != get); + DBUG_ON(msg->flags & XPC_M_SN2_DONE); + DBUG_ON(!(msg->flags & XPC_M_SN2_READY)); - payload = &msg->payload; + payload = &msg->payload; + } break; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/