[Samba] Re: [2.6 patch] fs/smbfs/request.c: turn NULL dereference into BUG()

Jean Delvare
Sat, 09 Apr 2005 08:47:43 -0000

Hi Andrew, all,

> In a case documented as
>
>   We should never be called with any of these states
>
> BUG() in a case that would later result in a NULL pointer dereference.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
>
> --- linux-2.6.12-rc1-mm3-full/fs/smbfs/request.c.old	2005-03-26
13:19:19.000000000 +0100
> +++ linux-2.6.12-rc1-mm3-full/fs/smbfs/request.c	2005-03-26
13:41:30.000000000 +0100
> @@ -786,8 +642,7 @@ int smb_request_recv(struct smb_sb_info
>  		/* We should never be called with any of these states */
>  	case SMB_RECV_END:
>  	case SMB_RECV_REQUEST:
> -		server->rstate = SMB_RECV_END;
> -		break;
> +		BUG();
>  	}
>
>  	if (result < 0) {

Can you please pick this one for next -mm?

Thanks,
--
Jean Delvare