From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3827995-1521495655-2-819508645330013138 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1521495654; b=H4squSsQDTtgx2zC0UH5r4Gb3tkF6kVBVm/d+L3m1iKfXwR eANKD1H87T9OHDBn2oWKf2+P1I/QqyMpEfuy2wWvwwO6mKszaTxvg0QxvUaSdO+Q TmtKdJ3tcXg0sU8jHIfR9vKcKmwxzmCj7PuteWMaoTmuFNQy/X+9OjnOGptA1dg5 3Kz1YlsmyMoSNUWUYektHPIJvB5rqEULN5Z1om6711+k6uPDbCDuOd1MS9WW/n1Y 1w+iBeGS8jKS0BljuT68BEiXWWfwaiCZDN0n+pN1X7WtT8xN2g4dE+ZohrOVO8Ph cEZitXKheyuS7gfCIKU9qoV79nO7NlSUwI3fNNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1521495654; bh=iyQbu6 PIPgd4/WOuKzKAjG1DcSLjfj9w6ustya3m+RM=; b=Q3pBplHD3O/GMcCZ9nV6z1 cXicv4rVZPwixYKb6/dLeSsDwWhlZemvAp1xwmD5g8ZR9Icl/h3zcPVJQCr1sW+J lGLOJsJUu9BoJYU1yYjazCnHw3vb2fJHvmWikyr+L8GM3rfEIDzWTQlgS3w8vWZ9 SOi6dwZw8TATPla0YUA0oKbdrZt+0A2kquu+K1obxgSF6QuR0nzHf53kiosE8E7G lI17d46ucGA29kG8nGNJX9L79p/0YPlNxTZfD9FQrQ3/uztuaSsyfEivuUmq8C8H 06ujMsbczdDVsRWsgJ6nrw10zqle/f5EjGuG1KJ1sw9VSk0Gy6i6t32GZhX3s6Mw == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=kEvPSbIp x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdduheefucdltddurdegtdefrddttddmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffuthffkfhfjghitgfggghsphejsehtqhertddttddunecuhfhrohhmpefurghshhgrucfnvghvihhnuceotehlvgigrghnuggvrhdrnfgvvhhinhesmhhitghrohhsohhfthdrtghomheqnecukfhppedvtdelrddufedvrddukedtrdeijedphedvrdduieekrdehgedrvdehvddpfhgvkedtmeemfegulegsmeejlegvjeemleegvggsmeehugeivdenucfrrghrrghmpehinhgvthepvddtledrudefvddrudektddrieejpdhhvghlohepvhhgvghrrdhkvghrnhgvlhdrohhrghdpmhgrihhlfhhrohhmpeeoshhtrggslhgvqdhofihnvghrsehvghgvrhdrkhgvrhhnvghlrdhorhhgqecuuefqffgjpeekuefkvffokffogfcuuffkkgfgpeejkeefgeenucevlhhushhtvghrufhiiigvpeefvd; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=kEvPSbIp x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdduheefucdltddurdegtdefrddttddmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffuthffkfhfjghitgfggghsphejsehtqhertddttddunecuhfhrohhmpefurghshhgrucfnvghvihhnuceotehlvgigrghnuggvrhdrnfgvvhhinhesmhhitghrohhsohhfthdrtghomheqnecukfhppedvtdelrddufedvrddukedtrdeijedphedvrdduieekrdehgedrvdehvddpfhgvkedtmeemfegulegsmeejlegvjeemleegvggsmeehugeivdenucfrrghrrghmpehinhgvthepvddtledrudefvddrudektddrieejpdhhvghlohepvhhgvghrrdhkvghrnhgvlhdrohhrghdpmhgrihhlfhhrohhmpeeoshhtrggslhgvqdhofihnvghrsehvghgvrhdrkhgvrhhnvghlrdhorhhgqecuuefqffgjpeekuefkvffokffogfcuuffkkgfgpeejkeefgeenucevlhhushhtvghrufhiiigvpeefvd; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965135AbeCSVkg (ORCPT ); Mon, 19 Mar 2018 17:40:36 -0400 Received: from mail-dm3nam03on0119.outbound.protection.outlook.com ([104.47.41.119]:17872 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965030AbeCSP7F (ORCPT ); Mon, 19 Mar 2018 11:59:05 -0400 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Christophe JAILLET , Steve French , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 040/281] SMB2: Fix share type handling Thread-Topic: [PATCH AUTOSEL for 4.9 040/281] SMB2: Fix share type handling Thread-Index: AQHTv5skP6N/CzfEY0KSomcaZiGQ/w== Date: Mon, 19 Mar 2018 15:58:38 +0000 Message-ID: <20180319155742.13731-40-alexander.levin@microsoft.com> References: <20180319155742.13731-1-alexander.levin@microsoft.com> In-Reply-To: <20180319155742.13731-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1015;7:jH11/x9XubEd4/zgkzLADoIc3is24QIUTENJ3NUvIT0CMnxHW11hXGy5bYmlTiXoqc/i7H5ibpaYEwVDJ8e0xetkFssXdtqJ914IGP3ld0Hg03GEe0iZzjKw7+/yuxOI149agSWSW6aNVmabZDw3hRsCup438gUINrxn8HjY1+R3eT+5OqPkOZhOi6T63thPwJZ0ZyAnp5LnwNCzFLV1xV1wFJKiAplQat6ETog5Cm9oyFYyC2xTdA0oG164w7Q6;20:jbOy0h+mH62BtsudqZnrohkRchg847PkPsNsy668MB7IQKGF8tXmVafjlNOZNAmRI9U0m3YSaByq2hsVgGsYxAsHqnHB2XFhpVEx0YqXnQNWCd5xgiGYaDtlMdDSLdvL25u8Bl80H+xKw97GdPX9Ikvvb5x0jdnWhoDT5Vh36/o= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 7d8fe75c-5f5c-498a-f4d7-08d58db25621 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB1015; x-ms-traffictypediagnostic: DM5PR2101MB1015: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(155761271638844)(21532816269658); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231221)(944501300)(52105095)(3002001)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB1015;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1015; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(346002)(376002)(39380400002)(39860400002)(366004)(189003)(199004)(69234005)(97736004)(72206003)(4326008)(99286004)(2900100001)(39060400002)(1076002)(186003)(10290500003)(36756003)(25786009)(66066001)(86612001)(102836004)(54906003)(110136005)(26005)(86362001)(53936002)(5660300001)(6512007)(14454004)(478600001)(106356001)(107886003)(316002)(2950100002)(6666003)(22452003)(6506007)(7736002)(3280700002)(3660700001)(305945005)(8936002)(2906002)(6116002)(3846002)(6436002)(68736007)(2501003)(5250100002)(6486002)(10090500001)(76176011)(8676002)(81156014)(105586002)(81166006)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1015;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-microsoft-antispam-message-info: 2m5TVB7v2RQxFLydS2lSC/2geo9hNJWSZr7pr6jIwZ9sdM3nx558xOHJFFzkqn4k1BEJAhQ/RUFLolpTUG+/B8o/ZtjbtIJBUtgnO/L3DzTAHs7aPJ358dlubmOAv/BnjtCgDpOMmjiEFduVMK0WMZiF1+pEFuEx78Nr03NY6UEPJ9T2NfKOimwxJZLQnlnsg2ahvgrcCFzq76gJZJbEYzQIoqIFyo4hlvpyG7GrCpwA5u8cxcfBWBhwc9aoSjyyC//BvJ3/ue8QTPrlFLFMRBtUmIkwyQHSg8PzEiUp4+/rAfB8/pWNI1e868WC+OkCRD0aF+mTZzMHaf7s8eFbFg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d8fe75c-5f5c-498a-f4d7-08d58db25621 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 15:58:38.1172 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1015 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Christophe JAILLET [ Upstream commit cd1230070ae1c12fd34cf6a557bfa81bf9311009 ] In fs/cifs/smb2pdu.h, we have: #define SMB2_SHARE_TYPE_DISK 0x01 #define SMB2_SHARE_TYPE_PIPE 0x02 #define SMB2_SHARE_TYPE_PRINT 0x03 Knowing that, with the current code, the SMB2_SHARE_TYPE_PRINT case can never trigger and printer share would be interpreted as disk share. So, test the ShareType value for equality instead. Fixes: faaf946a7d5b ("CIFS: Add tree connect/disconnect capability for SMB2= ") Signed-off-by: Christophe JAILLET Acked-by: Aurelien Aptel Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/cifs/smb2pdu.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 94c4c1901222..819daee8ba65 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -1159,15 +1159,19 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *= ses, const char *tree, goto tcon_exit; } =20 - if (rsp->ShareType & SMB2_SHARE_TYPE_DISK) + switch (rsp->ShareType) { + case SMB2_SHARE_TYPE_DISK: cifs_dbg(FYI, "connection to disk share\n"); - else if (rsp->ShareType & SMB2_SHARE_TYPE_PIPE) { + break; + case SMB2_SHARE_TYPE_PIPE: tcon->ipc =3D true; cifs_dbg(FYI, "connection to pipe share\n"); - } else if (rsp->ShareType & SMB2_SHARE_TYPE_PRINT) { - tcon->print =3D true; + break; + case SMB2_SHARE_TYPE_PRINT: + tcon->ipc =3D true; cifs_dbg(FYI, "connection to printer\n"); - } else { + break; + default: cifs_dbg(VFS, "unknown share type %d\n", rsp->ShareType); rc =3D -EOPNOTSUPP; goto tcon_error_exit; --=20 2.14.1