From patchwork Mon Oct 20 20:09:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 5107591 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 583559F30B for ; Mon, 20 Oct 2014 20:09:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8A04C20122 for ; Mon, 20 Oct 2014 20:09:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACF982011D for ; Mon, 20 Oct 2014 20:09:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751524AbaJTUJT (ORCPT ); Mon, 20 Oct 2014 16:09:19 -0400 Received: from mail-oi0-f53.google.com ([209.85.218.53]:44411 "EHLO mail-oi0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751192AbaJTUJS (ORCPT ); Mon, 20 Oct 2014 16:09:18 -0400 Received: by mail-oi0-f53.google.com with SMTP id v63so4262744oia.40 for ; Mon, 20 Oct 2014 13:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yiKJoJZaMPaJVtkGZmzzfiHGCWh2qE7HhFG3z4PyQ8c=; b=oKNcwlme8M9uz/hM8Bdri9dvJ6dlRE9oriXGZf0YJXTNSU7csx93W2wVfzY0NOpm3l gCqJ3TuetgF5Prqu7pvbatMnOFjaY5K0S+pXwHKfzGcd84KMTE50LO335LdWJA6DzUav MPl7SZj/1+Nj1LYxiBqRn4R0bC18gCA5Q0rhF4SZRl7rr+GbaE4VShzJ88Zto/whm7hY BCHoL3BmpecYinNT7WQ52h8E3PiAwGQYjaLBoXwMtkl+q0HRmVbcA0RZA+HU6dS/6ZvS QDNGk/+5wgyE/vkiLkVNmq1H85WFrsSwgOc87C0p3wEUgUmY71Mxs5SY8MT4AfnvCPA0 gD9g== X-Received: by 10.60.46.68 with SMTP id t4mr25284225oem.33.1413835758241; Mon, 20 Oct 2014 13:09:18 -0700 (PDT) Received: from ubuntu.localdomain (cpe-68-203-16-26.austin.res.rr.com. [68.203.16.26]) by mx.google.com with ESMTPSA id h1sm4373312obw.21.2014.10.20.13.09.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Oct 2014 13:09:17 -0700 (PDT) From: Steve French To: linux-cifs@vger.kernel.org Cc: Steve French Subject: [PATCH 2/3] [SMB3] decode_negTokenInit had wrong calling sequence Date: Mon, 20 Oct 2014 15:09:02 -0500 Message-Id: <1413835743-13566-2-git-send-email-smfrench@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413835743-13566-1-git-send-email-smfrench@gmail.com> References: <1413835743-13566-1-git-send-email-smfrench@gmail.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For krb5 enablement of SMB3, decoding negprot, caller now passes server struct not the old sec_type --- fs/cifs/smb2pdu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 8f1672b..0ca7f63 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -431,8 +431,7 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses) if (rc) goto neg_exit; if (blob_length) - rc = decode_neg_token_init(security_blob, blob_length, - &server->sec_type); + rc = decode_negTokenInit(security_blob, blob_length, server); if (rc == 1) rc = 0; else if (rc == 0) {