From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07F60C433F5 for ; Sun, 2 Oct 2022 00:25:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229461AbiJBAZo (ORCPT ); Sat, 1 Oct 2022 20:25:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbiJBAZn (ORCPT ); Sat, 1 Oct 2022 20:25:43 -0400 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E79C543F5 for ; Sat, 1 Oct 2022 17:25:40 -0700 (PDT) Received: by mail-lj1-x230.google.com with SMTP id a10so8443558ljq.0 for ; Sat, 01 Oct 2022 17:25:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=KWJBYIZqAzw1jiyER2T+6v+HaDsT18k/p5Vg2u7fGH0=; b=Hq8pCv+GvY1LCARkDqUQnHt8GepW3kNfvklt6Tcd9repGT5COvwBgh6LD5LpFTwGYX ExwwtIXAk1aEzVzrCAsQy3IP4ojahy3F/fQeH8Xq+xEumjtIKugw+zaA4m8LyW4eOaRq FEAf17OiedPhNR1nwsLu97Ttbfb+iVEN2sZFgkbmtduqrDDVt3boaRnaBMXxlvpjbPvE rIaMiK6DyH28TwRxtzZdHzgFl1n7oVPhg1yUje4NpaRSNmHxicNIyOMoGfnzPUdBi0p8 A6+E4aHtK2H82u8GB3e5IEcNrQ1/Sab3jsv1VBnNovT659hCug9UgJOnCefRGZPsBq59 hpxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=KWJBYIZqAzw1jiyER2T+6v+HaDsT18k/p5Vg2u7fGH0=; b=xtjId5Iw/SNsIGfnt17Z/l/pWdtWcI0kEpYX0jRXdzWmHWHdA5vAJH593kpuON7z4C u+cE52p/nLg8TO66Sq9dTRgjt6sdu31iq/+dn1pUiWhi+Q9WY+vaK14UncRyxhgzrK3E AQ0/bkrvt5MEynGHR89mNz77MbUaXAHGD7vlEKPEKntAhOwy+w9/k3c5JT59JRJbjvmb y6gl37sBKA0yGRN2OpvCqup9K+5QR+jh/Q1H7cCWQUthRtqKYG6VNps0aXNIuqMVytvM bNyh32RNFs1b1YAPZdaIW6AsO4uK+YqOSiXocflwZDYFUlCuVSGcogFFVZBhkiGvzcAl Q4Ng== X-Gm-Message-State: ACrzQf1YXtODE44zfHDf5hhx8ue6RNZLDViN3n86SmbOCE2Yhvczc+2s Rs9x0pLTDS2HgiDUHs2jqs3yxHQQfzVjGw== X-Google-Smtp-Source: AMsMyM7ZRQNBEzrjd8q1EZNgan0bLtSv1DGE1Kv9jFzyl2u9Ay6iyCYwobfPFTti1sV8+4At5kNMug== X-Received: by 2002:a2e:8ed8:0:b0:26d:cf40:71f0 with SMTP id e24-20020a2e8ed8000000b0026dcf4071f0mr868851ljl.453.1664670338487; Sat, 01 Oct 2022 17:25:38 -0700 (PDT) Received: from pohjola.lan (mobile-user-2e84be-149.dhcp.inet.fi. [46.132.190.149]) by smtp.gmail.com with ESMTPSA id c17-20020a056512105100b0049fff3f645esm901217lfb.70.2022.10.01.17.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Oct 2022 17:25:38 -0700 (PDT) From: =?UTF-8?q?Atte=20Heikkil=C3=A4?= To: tom@talpey.com Cc: atteh.mailbox@gmail.com, linkinjeon@kernel.org, linux-cifs@vger.kernel.org Subject: Re: [PATCH v3] ksmbd: validate share name from share config response Date: Sun, 2 Oct 2022 03:25:21 +0300 Message-Id: <20221002002521.2236-1-atteh.mailbox@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <3156964e-ef5d-2963-9945-04bcecabe896@talpey.com> References: <3156964e-ef5d-2963-9945-04bcecabe896@talpey.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org On Sat, 1 Oct 2022 19:20:52 -0400, Tom Talpey wrote: > On 10/1/2022 6:53 PM, Atte Heikkilä wrote: >> Share config response may contain the share name without casefolding as >> it is known to the user space daemon. When it is present, casefold and >> compare it to the share name the share config request was made with. If >> they differ, we have a share config which is incompatible with the way >> share config caching is done. This is the case when CONFIG_UNICODE is >> not set, the share name contains non-ASCII characters, and those non- >> ASCII characters do not match those in the share name known to user >> space. In other words, when CONFIG_UNICODE is not set, UTF-8 share >> names now work but are only case-insensitive in the ASCII range. >> >> Signed-off-by: Atte Heikkilä >> --- >> v3: >> - removed initial strcmp() check since it could only save a call to >> ksmbd_casefold_sharename() for matching ASCII-only share names >> >> v2: >> - no changes were made >> >> fs/ksmbd/ksmbd_netlink.h | 3 ++- >> fs/ksmbd/mgmt/share_config.c | 20 +++++++++++++++++--- >> fs/ksmbd/mgmt/share_config.h | 4 +++- >> fs/ksmbd/mgmt/tree_connect.c | 4 ++-- >> fs/ksmbd/misc.c | 4 ++-- >> fs/ksmbd/misc.h | 1 + >> 6 files changed, 27 insertions(+), 9 deletions(-) >> >> diff --git a/fs/ksmbd/ksmbd_netlink.h b/fs/ksmbd/ksmbd_netlink.h >> index e0cbcfa98c7e..ff07c67f4565 100644 >> --- a/fs/ksmbd/ksmbd_netlink.h >> +++ b/fs/ksmbd/ksmbd_netlink.h >> @@ -163,7 +163,8 @@ struct ksmbd_share_config_response { >> __u16 force_directory_mode; >> __u16 force_uid; >> __u16 force_gid; >> - __u32 reserved[128]; /* Reserved room */ >> + __s8 share_name[KSMBD_REQ_MAX_SHARE_NAME]; >> + __u32 reserved[112]; /* Reserved room */ > > Because this is a protocol/abi definition, it may be good practice > to code as > __u32 reserved[128 - KSMBD_REQ_MAX_SHARE_NAME]; > just in case the sharename constant changes in future. > You are right. That would probably be better. >> __u32 veto_list_sz; >> __s8 ____payload[]; >> }; >> diff --git a/fs/ksmbd/mgmt/share_config.c b/fs/ksmbd/mgmt/share_config.c >> index 5d039704c23c..c62e87b67247 100644 >> --- a/fs/ksmbd/mgmt/share_config.c >> +++ b/fs/ksmbd/mgmt/share_config.c >> @@ -16,6 +16,7 @@ >> #include "user_config.h" >> #include "user_session.h" >> #include "../transport_ipc.h" >> +#include "../misc.h" >> >> #define SHARE_HASH_BITS 3 >> static DEFINE_HASHTABLE(shares_table, SHARE_HASH_BITS); >> @@ -119,7 +120,8 @@ static int parse_veto_list(struct ksmbd_share_config *share, >> return 0; >> } >> >> -static struct ksmbd_share_config *share_config_request(const char *name) >> +static struct ksmbd_share_config *share_config_request(struct unicode_map *um, >> + const char *name) >> { >> struct ksmbd_share_config_response *resp; >> struct ksmbd_share_config *share = NULL; >> @@ -133,6 +135,17 @@ static struct ksmbd_share_config *share_config_request(const char *name) >> if (resp->flags == KSMBD_SHARE_FLAG_INVALID) >> goto out; >> >> + if (*resp->share_name) { >> + char *cf_resp_name; >> + bool equal; >> + >> + cf_resp_name = ksmbd_casefold_sharename(um, resp->share_name); >> + equal = cf_resp_name && !strcmp(cf_resp_name, name); > > This is a little bit hard to parse. So, if the casefolding returns > a non-null string, and the result does not equal the original name? > Maybe because it's evaluating a pointer as a bool, and using "!" to > evaluate the strcpy result is the confusing part, to me. > > equal = cf_resp_name != NULL && strcmp(cf_resp_name, name) 0= 0; > It should be `!IS_ERR(cf_resp_name) && !strcmp(cf_resp_name, name)'. The share name in the share config response is the actual share name which is known to user space. It is then casefolded according to the kernel's capabilities, which is either utf8_casefold() or tolower(). If it differs from the casefolded form of the share name used by the client, then the client-used share name is incompatible with the way the kernel does share config caching. > Also, strcmp() gets a lot of attention in the kernel these days. Is > this guaranteed safe? Both are always null-terminated if that is what you are asking. Tom, thank you very much for taking a look. I would not have noticed my careless mistake otherwise. > >> + kfree(cf_resp_name); >> + if (!equal) >> + goto out; >> + } >> + >> share = kzalloc(sizeof(struct ksmbd_share_config), GFP_KERNEL); >> if (!share) >> goto out; >> @@ -190,7 +203,8 @@ static struct ksmbd_share_config *share_config_request(const char *name) >> return share; >> } >> >> -struct ksmbd_share_config *ksmbd_share_config_get(const char *name) >> +struct ksmbd_share_config *ksmbd_share_config_get(struct unicode_map *um, >> + const char *name) >> { >> struct ksmbd_share_config *share; >> >> @@ -202,7 +216,7 @@ struct ksmbd_share_config *ksmbd_share_config_get(const char *name) >> >> if (share) >> return share; >> - return share_config_request(name); >> + return share_config_request(um, name); >> } >> >> bool ksmbd_share_veto_filename(struct ksmbd_share_config *share, >> diff --git a/fs/ksmbd/mgmt/share_config.h b/fs/ksmbd/mgmt/share_config.h >> index 7f7e89ecfe61..3fd338293942 100644 >> --- a/fs/ksmbd/mgmt/share_config.h >> +++ b/fs/ksmbd/mgmt/share_config.h >> @@ -9,6 +9,7 @@ >> #include >> #include >> #include >> +#include >> >> struct ksmbd_share_config { >> char *name; >> @@ -74,7 +75,8 @@ static inline void ksmbd_share_config_put(struct ksmbd_share_config *share) >> __ksmbd_share_config_put(share); >> } >> >> -struct ksmbd_share_config *ksmbd_share_config_get(const char *name); >> +struct ksmbd_share_config *ksmbd_share_config_get(struct unicode_map *um, >> + const char *name); >> bool ksmbd_share_veto_filename(struct ksmbd_share_config *share, >> const char *filename); >> #endif /* __SHARE_CONFIG_MANAGEMENT_H__ */ >> diff --git a/fs/ksmbd/mgmt/tree_connect.c b/fs/ksmbd/mgmt/tree_connect.c >> index 867c0286b901..8ce17b3fb8da 100644 >> --- a/fs/ksmbd/mgmt/tree_connect.c >> +++ b/fs/ksmbd/mgmt/tree_connect.c >> @@ -26,7 +26,7 @@ ksmbd_tree_conn_connect(struct ksmbd_conn *conn, struct ksmbd_session *sess, >> struct sockaddr *peer_addr; >> int ret; >> >> - sc = ksmbd_share_config_get(share_name); >> + sc = ksmbd_share_config_get(conn->um, share_name); >> if (!sc) > > Another pointer boolean evaluation, but I guess this one is existing. > >> return status; >> >> @@ -61,7 +61,7 @@ ksmbd_tree_conn_connect(struct ksmbd_conn *conn, struct ksmbd_session *sess, >> struct ksmbd_share_config *new_sc; >> >> ksmbd_share_config_del(sc); >> - new_sc = ksmbd_share_config_get(share_name); >> + new_sc = ksmbd_share_config_get(conn->um, share_name); >> if (!new_sc) { > > Ditto >> pr_err("Failed to update stale share config\n"); >> status.ret = -ESTALE; >> diff --git a/fs/ksmbd/misc.c b/fs/ksmbd/misc.c >> index 28459b1efaa8..9e8afaa686e3 100644 >> --- a/fs/ksmbd/misc.c >> +++ b/fs/ksmbd/misc.c >> @@ -227,7 +227,7 @@ void ksmbd_conv_path_to_windows(char *path) >> strreplace(path, '/', '\\'); >> } >> >> -static char *casefold_sharename(struct unicode_map *um, const char *name) >> +char *ksmbd_casefold_sharename(struct unicode_map *um, const char *name) >> { >> char *cf_name; >> int cf_len; >> @@ -273,7 +273,7 @@ char *ksmbd_extract_sharename(struct unicode_map *um, const char *treename) >> name = (pos + 1); >> >> /* caller has to free the memory */ >> - return casefold_sharename(um, name); >> + return ksmbd_casefold_sharename(um, name); >> } >> >> /** >> diff --git a/fs/ksmbd/misc.h b/fs/ksmbd/misc.h >> index cc72f4e6baf2..1facfcd21200 100644 >> --- a/fs/ksmbd/misc.h >> +++ b/fs/ksmbd/misc.h >> @@ -20,6 +20,7 @@ int get_nlink(struct kstat *st); >> void ksmbd_conv_path_to_unix(char *path); >> void ksmbd_strip_last_slash(char *path); >> void ksmbd_conv_path_to_windows(char *path); >> +char *ksmbd_casefold_sharename(struct unicode_map *um, const char *name); >> char *ksmbd_extract_sharename(struct unicode_map *um, const char *treename); >> char *convert_to_unix_name(struct ksmbd_share_config *share, const char *name); >> >