Re: [PATCH 1/2] cifs: fix length vs. total_read confusion in cifs_demultiplex_thread (try #2)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jan 27, 2011 at 10:41 AM, Jeff Layton <jlayton@xxxxxxxxxx> wrote:
> length at this point is the length returned by the last kernel_recvmsg
> call. total_read is the length of all of the data read so far. length
> is more or less meaningless at this point, so use total_read for
> everything.
>
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> Reviewed-by: Pavel Shilovsky <piastry@xxxxxxxxxxx>
> ---
>  fs/cifs/connect.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index 47034af..41a0ba0 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -581,12 +581,12 @@ incomplete_rcv:
>                else if (reconnect == 1)
>                        continue;
>
> -               length += 4; /* account for rfc1002 hdr */
> +               total_read += 4; /* account for rfc1002 hdr */
>
> -
> -               dump_smb(smb_buffer, length);
> -               if (checkSMB(smb_buffer, smb_buffer->Mid, total_read+4)) {
> -                       cifs_dump_mem("Bad SMB: ", smb_buffer, 48);
> +               dump_smb(smb_buffer, total_read);
> +               if (checkSMB(smb_buffer, smb_buffer->Mid, total_read)) {
> +                       cifs_dump_mem("Bad SMB: ", smb_buffer,
> +                                       total_read < 48 ? total_read : 48);
>                        continue;

Looks correct except that (and this is not a change in this patch) but
would be nice to know what is 48.

Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>

>                }
>
> --
> 1.7.3.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux