From patchwork Mon Sep 28 21:06:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 7280031 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1F1C29F39B for ; Mon, 28 Sep 2015 21:06:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5CB0B206B6 for ; Mon, 28 Sep 2015 21:06:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40EEB206A7 for ; Mon, 28 Sep 2015 21:06:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752071AbbI1VGW (ORCPT ); Mon, 28 Sep 2015 17:06:22 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:35949 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750966AbbI1VGW (ORCPT ); Mon, 28 Sep 2015 17:06:22 -0400 Received: by pablk4 with SMTP id lk4so87319811pab.3 for ; Mon, 28 Sep 2015 14:06:22 -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; bh=ByyyD1935o7PqDxcyiiW9d3ItSqCcVR776VoRwp0GKI=; b=hzZ4/Ov/6J4Qyby/Z2WbKGtNKIl0qbh4kNdeAQbYvgWdoYCnQXlQb3/XqGVlCVdEZp DrQURvIPHBuv0N3w1ymJeXiUblnGzHDLOL2gPlFviKohoQJ/FKSnRAVuOF5uK97m0Okp GAre9l4P70Y5KjK2HD+nSD4GZwQ+UkjRBwYEdyRGHwiP3NQYB+dc3YSCa2irG8oUGHbw MXw4Cq0LoI4M+K2iMJrM44Jm7zEeW7o58euSJo8SMqMM/eJNWlMNAurDLus9U0oOAja2 yDlaprMYK0jBJOKd5Ims3aXH+p37deUrGJcCInkA2sx/H70SnKxrA5T8adSgFkoIYc2V WmaA== X-Received: by 10.66.234.138 with SMTP id ue10mr29177142pac.9.1443474381950; Mon, 28 Sep 2015 14:06:21 -0700 (PDT) Received: from localhost.localdomain ([131.107.192.33]) by smtp.gmail.com with ESMTPSA id x6sm21169833pbt.3.2015.09.28.14.06.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Sep 2015 14:06:21 -0700 (PDT) From: Steve French To: linux-cifs@vger.kernel.org Cc: Steve French , Dan Carpenter , Steve French Subject: [PATCH] [SMB3] Missing null tcon check Date: Mon, 28 Sep 2015 16:06:15 -0500 Message-Id: <1443474375-6209-1-git-send-email-smfrench@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Pointed out by Dan Carpenter via smatch code analysis tool CC: Dan Carpenter Signed-off-by: Steve French --- fs/cifs/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index ce83e2e..597a417 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -922,7 +922,7 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, if (tcon && tcon->bad_network_name) return -ENOENT; - if ((tcon->seal) && + if ((tcon && tcon->seal) && ((ses->server->capabilities & SMB2_GLOBAL_CAP_ENCRYPTION) == 0)) { cifs_dbg(VFS, "encryption requested but no server support"); return -EOPNOTSUPP;