From patchwork Tue Jun 2 14:32:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Dsouza X-Patchwork-Id: 1302481 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bQVBnXNb; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49bvdH1Nljz9sSd for ; Wed, 3 Jun 2020 00:32:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726019AbgFBOcS (ORCPT ); Tue, 2 Jun 2020 10:32:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58223 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725958AbgFBOcR (ORCPT ); Tue, 2 Jun 2020 10:32:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591108336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WND/vobCbtVfEKZMI7mkWDPAddyxpKsuDdwgIQgXPo0=; b=bQVBnXNb6Y+g2kCvkx7um4s29vkZHRG9+6PALI7eSTG3qDrZO+hUnynbktRw65J31bGRAD MIVhJLMync3P+OXg+PANxV1HW+bPAnbPpaAhEVU35UMKJFnRnctfc4P6yhpEaDI+NhrrQy dJj2l7+N2QBEwGGdxSpaAPTkdNaI/Bg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-194-MZZzjh0KOESCF9bRezWPTA-1; Tue, 02 Jun 2020 10:32:14 -0400 X-MC-Unique: MZZzjh0KOESCF9bRezWPTA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B4C618FF662; Tue, 2 Jun 2020 14:32:12 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.74.9.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 271E15C220; Tue, 2 Jun 2020 14:32:08 +0000 (UTC) From: Kenneth D'souza To: linux-cifs@vger.kernel.org Cc: kdsouza@redhat.com, rbergant@redhat.com, smfrench@gmail.com Subject: [PATCH] Print sec= in /proc/mounts if not set from cmdline. Date: Tue, 2 Jun 2020 20:02:05 +0530 Message-Id: <20200602143205.23854-1-kdsouza@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Currently the end user is unaware with what sec type the cifs share is mounted if no sec= option is parsed. Example: $ echo 0x3 > /proc/fs/cifs/SecurityFlags Mount a cifs share with vers=1.0, it should pick sec=ntlm. If mount is successful we print sec=ntlm //smb-server/data /cifs cifs rw,relatime,vers=1.0,sec=ntlm,cache=strict,username=testuser,uid=0,noforceuid,gid=0,noforcegid,addr=x.x.x.x,file_mode=0755,dir_mode=0755,soft,nounix,serverino,mapposix,rsize=61440,wsize=16580,bsize=1048576,echo_interval=60,actimeo=1 Signed-off-by: Kenneth D'souza Signed-off-by: Roberto Bergantinos Corpas --- fs/cifs/sess.c | 1 + fs/cifs/smb2pdu.c | 1 + 2 files changed, 2 insertions(+) diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 43a88e26d26b..a5673fcab2f7 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -1698,6 +1698,7 @@ static int select_sec(struct cifs_ses *ses, struct sess_data *sess_data) return -ENOSYS; } + ses->sectype = type; return 0; } diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index b30aa3cdd845..bce8a0137fa4 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -1601,6 +1601,7 @@ SMB2_select_sec(struct cifs_ses *ses, struct SMB2_sess_data *sess_data) return -EOPNOTSUPP; } + ses->sectype = type; return 0; }