mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@redhat.com>
To: Tim Gardner <timg@tpi.com>
Cc: linux-cifs@vger.kernel.org, samba-technical@lists.samba.org,
	linux-kernel@vger.kernel.org, Steve French <sfrench@samba.org>
Subject: Re: [PATCH 1/2 linux-next] cifs: Remove redundant multiplex identifier check from check_smb_hdr()
Date: Wed, 16 Oct 2013 11:36:32 -0400	[thread overview]
Message-ID: <20131016113632.6548d399@tlielax.poochiereds.net> (raw)
In-Reply-To: <1381936190-67628-1-git-send-email-timg@tpi.com>

On Wed, 16 Oct 2013 09:09:49 -0600
Tim Gardner <timg@tpi.com> wrote:

> The only call site for check_smb_header() assigns 'mid' from the SMB
> packet, which is then checked again in check_smb_header(). This seems
> like redundant redundancy.
> 
> Cc: Steve French <sfrench@samba.org>
> Signed-off-by: Tim Gardner <timg@tpi.com>
> ---
>  fs/cifs/misc.c |   12 ++----------
>  1 file changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
> index 138a011..298e31e 100644
> --- a/fs/cifs/misc.c
> +++ b/fs/cifs/misc.c
> @@ -278,7 +278,7 @@ header_assemble(struct smb_hdr *buffer, char smb_command /* command */ ,
>  }
>  
>  static int
> -check_smb_hdr(struct smb_hdr *smb, __u16 mid)
> +check_smb_hdr(struct smb_hdr *smb)
>  {
>  	/* does it have the right SMB "signature" ? */
>  	if (*(__le32 *) smb->Protocol != cpu_to_le32(0x424d53ff)) {
> @@ -287,13 +287,6 @@ check_smb_hdr(struct smb_hdr *smb, __u16 mid)
>  		return 1;
>  	}
>  
> -	/* Make sure that message ids match */
> -	if (mid != smb->Mid) {
> -		cifs_dbg(VFS, "Mids do not match. received=%u expected=%u\n",
> -			 smb->Mid, mid);
> -		return 1;
> -	}
> -
>  	/* if it's a response then accept */
>  	if (smb->Flags & SMBFLG_RESPONSE)
>  		return 0;
> @@ -310,7 +303,6 @@ int
>  checkSMB(char *buf, unsigned int total_read)
>  {
>  	struct smb_hdr *smb = (struct smb_hdr *)buf;
> -	__u16 mid = smb->Mid;
>  	__u32 rfclen = be32_to_cpu(smb->smb_buf_length);
>  	__u32 clc_len;  /* calculated length */
>  	cifs_dbg(FYI, "checkSMB Length: 0x%x, smb_buf_length: 0x%x\n",
> @@ -348,7 +340,7 @@ checkSMB(char *buf, unsigned int total_read)
>  	}
>  
>  	/* otherwise, there is enough to get to the BCC */
> -	if (check_smb_hdr(smb, mid))
> +	if (check_smb_hdr(smb))
>  		return -EIO;
>  	clc_len = smbCalcSize(smb);
>  

Nice...

Reviewed-by: Jeff Layton <jlayton@redhat.com>

  parent reply	other threads:[~2013-10-16 15:36 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-16 15:09 Tim Gardner
2013-10-16 15:09 ` [PATCH 2/2 linux-next] cifs: Make big endian multiplex ID sequences monotonic on the wire Tim Gardner
2013-10-16 15:40   ` Jeff Layton
2013-10-16 16:02     ` Tim Gardner
2013-10-16 16:25   ` Shirish Pargaonkar
2013-10-16 16:39     ` Tim Gardner
2013-10-16 15:36 ` Jeff Layton [this message]
2013-10-28 14:37   ` [PATCH 1/2 linux-next] cifs: Remove redundant multiplex identifier check from check_smb_hdr() Steve French

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131016113632.6548d399@tlielax.poochiereds.net \
    --to=jlayton@redhat.com \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=samba-technical@lists.samba.org \
    --cc=sfrench@samba.org \
    --cc=timg@tpi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®