ksmbd: validate share name from share config response
Subsystems (3)
PATCH v2 1/2 ksmbd: validate share name from share config response
Share config response may contain the share name without casefolding as it is known to the user space daemon. When it is present, compare it to the share name the share config request was made with. If they differ, casefold it and compare again. If they still differ, we have a share config which is incompatible with the way we do share config caching. Currently, this is the case if 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.
---
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(-)
fs/ksmbd/ksmbd_netlink.h +2 -1
@@ -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 */ __u32 veto_list_sz;__s8 ____payload[]; };
fs/ksmbd/mgmt/share_config.c +17 -3
@@ -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 &&strcmp (resp->share_name, 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); +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,
fs/ksmbd/mgmt/share_config.h +3 -1
@@ -9,6 +9,7 @@#include <linux/workqueue.h> #include <linux/hashtable.h> #include <linux/path.h> +#include <linux/unicode.h> 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__ */
fs/ksmbd/mgmt/tree_connect.c +2 -2
@@ -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)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) {pr_err ("Failed to update stale share config\n" ); status.ret = -ESTALE ;
fs/ksmbd/misc.c +2 -2
@@ -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); }/**
fs/ksmbd/misc.h +1 -0
@@ -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);
Signature · 1 line
2.37.3
PATCH v2 2/2 ksmbd-tools: preserve share name case by casefolding at lookup-time
Preserve the case of share names by doing casefolding at hash table lookup-time. This is preferrable for a few reasons.
First, ksmbd can be built such that it is not capable of casefolding UTF-8 share names. Such share names are then case-sensitive if they have non-ASCII characters, and connections to them should succeed only when matching the name in ksmbd.conf, ignoring ASCII case. As such, the case-preserved share name will be sent to ksmbd in the share config response so that ksmbd can casefold it and validate against the share name it knows. This is necessitated by the way share config caching is done.
Second, addshare should ideally preserve formatting when modifying ksmbd.conf. Then, preserving the case for user readability reasons is desirable. Also, since ksmbd.conf is just as often edited with a text editor, it is important that share names can be searched using it, which is often not possible when they are written casefolded.
Third, case-preserved share names are now used in SRVSVC GET_SHARE_INFO response, with __share_entry_data_ctr0() and __share_entry_data_ctr1(), and so they are seen as written in ksmbd.conf.
Also, in shm_casefold_share_name(), note that g_utf8_casefold() aborts on fail, and if g_utf8_normalize() fails, g_ascii_strdown() aborts on fail. share_name' was leaked in srvsvc_share_get_info_invoke() as the string returned by shm_casefold_share_name() should be freed. Before that, share_name' was the string returned by g_ascii_strdown() and leaked then as well.
---
v2:
- changed commit message to correctly state that g_utf8_casefold() aborts on fail rather than `cannot fail'.
addshare/addshare.c | 6 ++--- addshare/share_admin.c | 8 +++--- include/linux/ksmbd_server.h | 3 ++- include/management/share.h | 3 ++- lib/config_parser.c | 5 ++-- lib/management/share.c | 50 ++++++++++++++++++++++++++---------- mountd/rpc_srvsvc.c | 5 +--- 7 files changed, 53 insertions(+), 27 deletions(-)
addshare/addshare.c +3 -3
@@ -124,17 +124,17 @@ int main(int argc, char *argv[])switch (c) {case 'a' :g_free (share); - share =shm_casefold_share_name (optarg,strlen (optarg)); + share =g_strdup (optarg); command = command_add_share;break ;case 'd' :g_free (share); - share =shm_casefold_share_name (optarg,strlen (optarg)); + share =g_strdup (optarg); command = command_del_share;break ;case 'u' :g_free (share); - share =shm_casefold_share_name (optarg,strlen (optarg)); + share =g_strdup (optarg); command = command_update_share;break ;case 'o' :
addshare/share_admin.c +5 -3
@@ -113,8 +113,8 @@ static void write_remove_share_cb(gpointer key, {struct smbconf_group *g = (struct smbconf_group *)value; -if (!g_ascii_strcasecmp (g->name, name)) { -pr_info ("Share `%s' removed\n" , g->name); +if (shm_share_name_equal (g->name, name)) { +pr_info ("Share `%s' removed\n" , name);return ; }
@@ -187,6 +187,9 @@ int command_update_share(char *smbconf, char *name, char *opts) goto error; } +g_free (existing_group->name); + existing_group->name =g_strdup (name); +g_hash_table_foreach (update_group->kv, update_share_cb, existing_group->kv);
@@ -199,7 +202,6 @@ int command_update_share(char *smbconf, char *name, char *opts)close (conf_fd);g_free (aux_name);return 0 ; - error:g_free (aux_name);return -EINVAL ;
include/linux/ksmbd_server.h +2 -1
@@ -91,7 +91,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 */ __u32 veto_list_sz;__s8 ____payload[]; };
include/management/share.h +2 -1
@@ -141,7 +141,6 @@ static inline int test_share_flag(struct ksmbd_share *share, int flag)struct ksmbd_share *get_ksmbd_share (struct ksmbd_share *share);void put_ksmbd_share (struct ksmbd_share *share); -char *shm_casefold_share_name (char *name,size_t len);struct ksmbd_share *shm_lookup_share (char *name);struct smbconf_group ;
@@ -150,6 +149,8 @@ int shm_add_new_share(struct smbconf_group *group);void shm_remove_all_shares (void );void shm_destroy (void ); +guint shm_share_name_hash (gconstpointer name); +gboolean shm_share_name_equal (gconstpointer lname,gconstpointer rname);int shm_init (void ); int shm_lookup_users_map(struct ksmbd_share *share,
lib/config_parser.c +3 -2
@@ -93,7 +93,7 @@ static int add_new_group(char *line)while (*end && *end !=']' ) end =g_utf8_find_next_char (end,NULL ); - name =shm_casefold_share_name (begin +1 , end - begin -1 ); + name =g_strndup (begin +1 , end - begin -1 );if (!name) goto out_free;
@@ -261,7 +261,8 @@ static int init_smbconf_parser(void)if (parser.groups)return 0 ; - parser.groups =g_hash_table_new (g_str_hash, g_str_equal); + parser.groups =g_hash_table_new (shm_share_name_hash, + shm_share_name_equal);if (!parser.groups)return -ENOMEM ;return 0 ;
lib/management/share.c +37 -13
74 lines not on this page · raw message
mountd/rpc_srvsvc.c +1 -4
@@ -169,11 +169,8 @@ static int srvsvc_share_get_info_invoke(struct ksmbd_rpc_pipe *pipe, {struct ksmbd_share *share;int ret; -gchar *share_name; - share_name =shm_casefold_share_name (STR_VAL (hdr->share_name), -strlen (STR_VAL (hdr->share_name))); - share =shm_lookup_share (share_name); + share =shm_lookup_share (STR_VAL (hdr->share_name));if (!share)return 0 ;
Signature · 1 line
2.37.3
Re: [PATCH v2 2/2] ksmbd-tools: preserve share name case by casefolding at lookup-time
2022-09-29 3:42 GMT+09:00, Atte Heikkilä <[email protected]>:
Quoted 22 lines
Preserve the case of share names by doing casefolding at hash table lookup-time. This is preferrable for a few reasons.
First, ksmbd can be built such that it is not capable of casefolding UTF-8 share names. Such share names are then case-sensitive if they have non-ASCII characters, and connections to them should succeed only when matching the name in ksmbd.conf, ignoring ASCII case. As such, the case-preserved share name will be sent to ksmbd in the share config response so that ksmbd can casefold it and validate against the share name it knows. This is necessitated by the way share config caching is done.
Second, addshare should ideally preserve formatting when modifying ksmbd.conf. Then, preserving the case for user readability reasons is desirable. Also, since ksmbd.conf is just as often edited with a text editor, it is important that share names can be searched using it, which is often not possible when they are written casefolded.
Third, case-preserved share names are now used in SRVSVC
GET_SHARE_INFOresponse, with__share_entry_data_ctr0()and__share_entry_data_ctr1(), and so they are seen as written in ksmbd.conf.
Quoted 8 lines
Also, in
shm_casefold_share_name(), note thatg_utf8_casefold()aborts on fail, and ifg_utf8_normalize()fails,g_ascii_strdown()aborts on fail.share_name' was leaked in srvsvc_share_get_info_invoke() as the string returned by shm_casefold_share_name() should be freed. Before that,share_name' was the string returned byg_ascii_strdown()and leaked then as well.Signed-off-by Atte Heikkilä <[email protected]>
Applied, Thanks for your work!
2022-09-29 3:42 GMT+09:00, Atte Heikkilä <[email protected]>:
Quoted 11 lines
Share config response may contain the share name without casefolding as it is known to the user space daemon. When it is present, compare it to the share name the share config request was made with. If they differ, casefold it and compare again. If they still differ, we have a share config which is incompatible with the way we do share config caching. Currently, this is the case if
CONFIG_UNICODEis 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, whenCONFIG_UNICODEis not set, UTF-8 share names now work but are only case-insensitive in the ASCII range.
Quoted 1 line
Signed-off-by Atte Heikkilä <[email protected]>
Thanks for your work!