From patchwork Tue Sep 15 01:33:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1364033 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=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=DSnJ9+7c; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VCF4Tg91; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Br5Qc5Lpmz9sVT for ; Tue, 15 Sep 2020 11:35:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=8ENPImvmumlF4Nle9L2umMoSy5X69RuFPdfLTFgpwAM=; b=DSnJ9+7csHAPSKWZ8bB+H0VIFI QSPxDe+gXxMmSa3LVVQKChp1WexOBP8B5dne8hCROkdKfaMgR+guuQQdSkY8G9xyHNyrCYnXrvaAR vlNbp1wbE8MNK7xWP9SOz86RXIUX9K5Kkg8LgbiPV4CjwEiGDkc8siU65ZnL5Uq3kY+9mG3xJ5Tok kcXFP3w9aVG9tMmtItJkqNTHPy/w3VTQEn0dO+jwdFpZ+4dMIX2MGPJWV05trRYcCSJc6yVHPwmTQ 2vADi/Sfb+FphRvmRgrU9afY+yOBIZzcuZSUcdz2SiYHVU/+d41ail/XJ2/CaCr7cJpvhv8jmbY+1 U26VXq1Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHzqp-0004oQ-Ia; Tue, 15 Sep 2020 01:33:43 +0000 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHzqm-0004nZ-Uj for openwrt-devel@lists.openwrt.org; Tue, 15 Sep 2020 01:33:41 +0000 Received: by mail-pj1-x1043.google.com with SMTP id b17so899624pji.1 for ; Mon, 14 Sep 2020 18:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=k921hkTEc77DXX70fsW+mKD14rF4BbhUrH6VgcGtfqM=; b=VCF4Tg91rogOVZjGz1OEePs4P2WGGfqUWX2qCF7KSArcYLPx/ZWEVVD3L7zV/M9bX2 H65xh4aaT6StOfmwnwlwgoq7Ucx3c996kmOQFXN+PNJ5+gQBcs08fbBXF6PKkk+VXvs5 EeC8rKmwDwL79T6tSYhnKZcKZsvSTbbG7zmaVanY0hIaHyrbmJyj/c1rK/CKZZF7ai2U x3k6et18rFb2ERdL1EfVtlAfaxoCDLc0UgDiq5nl1ps0y3MwlfIrDwjh1Ns091Rk2Bzc 2jCKn8R7/m84QdlE5Jbo3cDG9f1JiMMo98BL4ww+tZL3o7haBE2bNsyB5ePX5OMZWkSV Pt5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=k921hkTEc77DXX70fsW+mKD14rF4BbhUrH6VgcGtfqM=; b=gip2gYCkZGQNc9wA/Mwf2Pshyf+8cWLWzH99rB3GKzNIAA+zUV+DXa85gZhtaTxEby DNml7woBicr9VT/0M4p7CjA/CJVvELAeN1DGT246l7rWSSKmEdMfI87FSMWZ7KUyRfQ8 ksfI3JF6Zfcrq3JjunprGGisPrZnW4P6CpTh7Tg1s3Ue+TNSbOsChdLEcKNnDP6B38Ly SCJ5nnxfvo6FZCyCxTZB6scWLRYkcyniTPcfAkPU6wRrVQCTfiuvh5VkPk8Sj1C0dk94 9RI9y2O5GjkpLfXIslAZSCPhsmhlUmZPAq34s8yXA38vabU0vkM0BK8LyknztWh5z1EA ooIw== X-Gm-Message-State: AOAM5330kRRkhDuTIw71sgla9rw3qLnGypBAdVUe7vzwI6vF0rFMJLFE BBosE3F6BruSauG9lJf7Xa+BkcHaOBw2KA== X-Google-Smtp-Source: ABdhPJwHzlQ/GPR4Y/zUE2TrYecsQJRbRMnentRIWIIvfxE0fFDcaLoUv0wMkiRU5wng9pTxD1rlWg== X-Received: by 2002:a17:902:9685:: with SMTP id n5mr16554305plp.73.1600133618506; Mon, 14 Sep 2020 18:33:38 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id j6sm11114606pfi.129.2020.09.14.18.33.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 18:33:37 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/2] fs/cifs: update module dependencies Date: Mon, 14 Sep 2020 18:33:35 -0700 Message-Id: <20200915013336.678405-1-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200914_213341_010223_09AB6C5C X-CRM114-Status: GOOD ( 11.40 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1043 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 0fdfef9aa7ee68ddd508aef7c98630cfc054f8d6 upstream removed CIFS_SMB311. Kernels 4.19 and above do not have it. Currently only kernels 4.19 and 5.4 are in the tree. The Kconfig file in the kernel has more selection that what is in here. Add the rest and reorder based on upstream ordering. Signed-off-by: Rosen Penev --- package/kernel/linux/modules/fs.mk | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index cfce929c0c..abaf2d07fb 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -91,19 +91,22 @@ define KernelPackage/fs-cifs CONFIG_CIFS \ CONFIG_CIFS_XATTR=y \ CONFIG_CIFS_DFS_UPCALL=n \ - CONFIG_CIFS_UPCALL=n \ - CONFIG_CIFS_SMB311=n + CONFIG_CIFS_UPCALL=n FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko AUTOLOAD:=$(call AutoLoad,30,cifs) $(call AddDepends/nls) DEPENDS+= \ - +kmod-crypto-arc4 \ - +kmod-crypto-hmac \ - +kmod-crypto-md5 \ +kmod-crypto-md4 \ - +kmod-crypto-des \ + +kmod-crypto-md5 \ + +kmod-crypto-sha256 \ + +kmod-crypto-sha512 \ + +kmod-crypto-cmac \ + +kmod-crypto-hmac \ + +kmod-crypto-arc4 \ + +kmod-crypto-aead \ + +kmod-crypto-ccm \ +kmod-crypto-ecb \ - +kmod-crypto-sha256 + +kmod-crypto-des endef define KernelPackage/fs-cifs/description From patchwork Tue Sep 15 01:33:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1364034 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=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=mOdj7S79; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=tjBdcnWf; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Br5Qj1TYWz9sVK for ; Tue, 15 Sep 2020 11:35:40 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KMUmUrNaRsu3AIPOMcW0uvL5J53UA5jCIafQl2Xz+q8=; b=mOdj7S79uuwZsVGWpXWC6Twtno d7B63hSsJKf6I1xZaAVoEeXlp6i/Z0r9Ko2WC4BcLycUvia52lMoZVAAwj54rLh/lffqht3FROlbd n9N2DvOa3vxaNts/lHVmRugn1uNz+ZabRmBiQUxLeCqy8q0qP2Oa8q+OVYnJF1KS11aRll+q+L8Zv TRefr1bbbHkV/gbu1/VHuJRjpZTfZKjkpCOHrKyWgD65URg4l5ZgbAAOaNzOo8+dD3DvFVMln7L6d DVURNzWeQBjezZ3JXPFxUx7yob9UBAkZoOFiWL3Y8LMYE7GTTCyExGiKkIOg6Au6SeP5Hv9p4Z9j4 uoxprpCA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHzqq-0004ob-OO; Tue, 15 Sep 2020 01:33:44 +0000 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHzqn-0004nb-Ce for openwrt-devel@lists.openwrt.org; Tue, 15 Sep 2020 01:33:42 +0000 Received: by mail-pj1-x1043.google.com with SMTP id fa1so922822pjb.0 for ; Mon, 14 Sep 2020 18:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=12M3noGrlPmgtSDAeEu9Jkwnyt8DkKM6tfk2Fh+pMXc=; b=tjBdcnWfuY82l5bi/7XS6C7+xq8kbI8+6fkbxctjp2z4L4fviay25AHb88JUBj5EW7 MOlfzyUC6oG29roEaVrfueE0jN0o85+GbwfmuPwmTYOYhSHqrXCiCks8toWcdW6DcJsW i4KOOMIWBA1RZsy2nz5vMOJ/zlglB9H4BtvO0/rIXr8DppOpEsmAnHdL6oZ7l+maScAa ylW9G421NMpMsRzouVX5Zx3wAFQN2j4xcxHP6F606N1AycI+xQAQLF7RMM1duD/N165V C4FGY75DtLuyK0aOYaj7B87PkUsUzKU8a6X0lNdYBAFraheaSX0VmlCF2IFz+m7r66Ue lLvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=12M3noGrlPmgtSDAeEu9Jkwnyt8DkKM6tfk2Fh+pMXc=; b=jA/LzDhb1HW7HoGGI/wQ0AfD95ROJBtcgxgWtsafYM5xlJJUlTZ6piiHjWF/ugpwVr +q99KzVUnoNMxkWzO0IK4fDl5US5wOcEX4TYp92lyHu2RGuDZPbNurSvgjC6QRaJUIMo IJJGUhszWZBp31yyuH1SamVjDDQi9S9ti2aw7eaKtpUKPymlvvlYmhEXeHl01GaqdGNt 4N5xtcxFTGDkUuugSMsfmiTibp+psQPg9Dn7MjRALEEI5Hq48fxMEbrG8BXpVmC0DJK3 O6JWAss3T3jRK4wnb+jhEiNq1PgOpoG7DPuS+uyj/22h6IvHp5uhA/Aw/4ebY9w7CcRI e0HA== X-Gm-Message-State: AOAM531RCeNBpbMdv7JNv6fv3Ch1WTkb5/kLWLJAQnPLwliMVSdjuLDi 9BMTHuB2kXfv+B0aeBKWMnEAeQC5Utme7g== X-Google-Smtp-Source: ABdhPJy7x3aNXNvV2Os13WNfTVCNgo/NunHg9YBNzAWYOzyKCBzTuIAwLcwgoRgPARW45CMD/PqNrQ== X-Received: by 2002:a17:902:7c03:b029:d0:cbe1:e71b with SMTP id x3-20020a1709027c03b02900d0cbe1e71bmr16982641pll.41.1600133619475; Mon, 14 Sep 2020 18:33:39 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id j6sm11114606pfi.129.2020.09.14.18.33.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 18:33:38 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] target/linux: disable legacy and debug cifs options Date: Mon, 14 Sep 2020 18:33:36 -0700 Message-Id: <20200915013336.678405-2-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200915013336.678405-1-rosenp@gmail.com> References: <20200915013336.678405-1-rosenp@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200914_213341_447793_911685B9 X-CRM114-Status: GOOD ( 13.49 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1043 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org CIFS_ALLOW_INSECURE_LEGACY is only relevant for mounting shares that are provided by old CIFS servers. It is not relevant to the Samba or ksmbd package that provide a server. CIFS_STATS is a debugging option. It is not really useful for end users Signed-off-by: Rosen Penev --- target/linux/generic/config-4.19 | 4 ++-- target/linux/generic/config-5.4 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index d4a942f9aa..e9c6306307 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -776,14 +776,14 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CICADA_PHY is not set # CONFIG_CIFS is not set # CONFIG_CIFS_ACL is not set -CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y +# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set # CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_FSCACHE is not set # CONFIG_CIFS_NFSD_EXPORT is not set CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB2 is not set -CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS is not set # CONFIG_CIFS_STATS2 is not set # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_XATTR is not set diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 6f63b8c5dd..b8d214349c 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -826,14 +826,14 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CICADA_PHY is not set # CONFIG_CIFS is not set # CONFIG_CIFS_ACL is not set -CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y +# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set # CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_FSCACHE is not set # CONFIG_CIFS_NFSD_EXPORT is not set CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB2 is not set -CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS is not set # CONFIG_CIFS_STATS2 is not set # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_XATTR is not set