[2.6 patch] fs/smbfs/request.c: fix NULL dereference

From: Adrian Bunk
Date: Thu Mar 24 2005 - 21:06:52 EST


The Coverity checker found that if req was NULL because find_request
returned NULL, this resulted in a break from the switch, but req was
later dereferenced (look at the last line of this patch).

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.12-rc1-mm2-full/fs/smbfs/request.c.old 2005-03-25 00:45:08.000000000 +0100
+++ linux-2.6.12-rc1-mm2-full/fs/smbfs/request.c 2005-03-25 00:47:14.000000000 +0100
@@ -783,20 +783,23 @@ int smb_request_recv(struct smb_sb_info
break;
break;

/* We should never be called with any of these states */
case SMB_RECV_END:
case SMB_RECV_REQUEST:
server->rstate = SMB_RECV_END;
break;
}

+ if (!req)
+ return -ENOMEM;
+
if (result < 0) {
/* We saw an error */
return result;
}

if (server->rstate != SMB_RECV_END)
return 0;

result = 0;
if (req->rq_trans2_command && req->rq_rcls == SUCCESS)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/