From patchwork Thu Jan 27 12:47:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 512001 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0RCm14L011741 for ; Thu, 27 Jan 2011 12:48:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752839Ab1A0MsB (ORCPT ); Thu, 27 Jan 2011 07:48:01 -0500 Received: from mail-yw0-f46.google.com ([209.85.213.46]:37132 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752812Ab1A0MsB (ORCPT ); Thu, 27 Jan 2011 07:48:01 -0500 Received: by ywe10 with SMTP id 10so559749ywe.19 for ; Thu, 27 Jan 2011 04:48:00 -0800 (PST) Received: by 10.90.72.6 with SMTP id u6mr3011047aga.109.1296132480280; Thu, 27 Jan 2011 04:48:00 -0800 (PST) Received: from salusa.poochiereds.net (cpe-071-070-153-003.nc.res.rr.com [71.70.153.3]) by mx.google.com with ESMTPS id b27sm20389983ana.8.2011.01.27.04.47.59 (version=SSLv3 cipher=RC4-MD5); Thu, 27 Jan 2011 04:47:59 -0800 (PST) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH 1/2] cifs: fix length vs. total_read confusion in cifs_demultiplex_thread Date: Thu, 27 Jan 2011 07:47:55 -0500 Message-Id: <1296132476-21948-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.3.4 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 27 Jan 2011 12:48:02 +0000 (UTC) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 47034af..12a3e04 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -581,11 +581,10 @@ 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)) { + dump_smb(smb_buffer, total_read); + if (checkSMB(smb_buffer, smb_buffer->Mid, total_read)) { cifs_dump_mem("Bad SMB: ", smb_buffer, 48); continue; }