mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-04-03 12:05:13 +02:00
c6f8326f26
commit7987cce375upstream. The CephFS kernel client has regression starting from 6.18-rc1. We have issue in ceph_mds_auth_match() if fs_name == NULL: const char fs_name = mdsc->fsc->mount_options->mds_namespace; ... if (auth->match.fs_name && strcmp(auth->match.fs_name, fs_name)) { / fsname mismatch, try next one */ return 0; } Patrick Donnelly suggested that: In summary, we should definitely start decoding `fs_name` from the MDSMap and do strict authorizations checks against it. Note that the `-o mds_namespace=foo` should only be used for selecting the file system to mount and nothing else. It's possible no mds_namespace is specified but the kernel will mount the only file system that exists which may have name "foo". This patch reworks ceph_mdsmap_decode() and namespace_equals() with the goal of supporting the suggested concept. Now struct ceph_mdsmap contains m_fs_name field that receives copy of extracted FS name by ceph_extract_encoded_string(). For the case of "old" CephFS file systems, it is used "cephfs" name. [ idryomov: replace redundant %*pE with %s in ceph_mdsmap_decode(), get rid of a series of strlen() calls in ceph_namespace_match(), drop changes to namespace_equals() body to avoid treating empty mds_namespace as equal, drop changes to ceph_mdsc_handle_fsmap() as namespace_equals() isn't an equivalent substitution there ] Cc: stable@vger.kernel.org Fixes:22c73d52a6("ceph: fix multifs mds auth caps issue") Link: https://tracker.ceph.com/issues/73886 Signed-off-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com> Reviewed-by: Patrick Donnelly <pdonnell@ibm.com> Tested-by: Patrick Donnelly <pdonnell@ibm.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
81 lines
1.9 KiB
C
81 lines
1.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _FS_CEPH_MDSMAP_H
|
|
#define _FS_CEPH_MDSMAP_H
|
|
|
|
#include <linux/bug.h>
|
|
#include <linux/ceph/types.h>
|
|
|
|
struct ceph_mds_client;
|
|
|
|
/*
|
|
* mds map - describe servers in the mds cluster.
|
|
*
|
|
* we limit fields to those the client actually xcares about
|
|
*/
|
|
struct ceph_mds_info {
|
|
u64 global_id;
|
|
struct ceph_entity_addr addr;
|
|
s32 state;
|
|
int num_export_targets;
|
|
bool laggy;
|
|
u32 *export_targets;
|
|
};
|
|
|
|
struct ceph_mdsmap {
|
|
u32 m_epoch, m_client_epoch, m_last_failure;
|
|
u32 m_root;
|
|
u32 m_session_timeout; /* seconds */
|
|
u32 m_session_autoclose; /* seconds */
|
|
u64 m_max_file_size;
|
|
/*
|
|
* maximum size for xattrs blob.
|
|
* Zeroed by default to force the usage of the (sync) SETXATTR Op.
|
|
*/
|
|
u64 m_max_xattr_size;
|
|
u32 m_max_mds; /* expected up:active mds number */
|
|
u32 m_num_active_mds; /* actual up:active mds number */
|
|
u32 possible_max_rank; /* possible max rank index */
|
|
struct ceph_mds_info *m_info;
|
|
|
|
/* which object pools file data can be stored in */
|
|
int m_num_data_pg_pools;
|
|
u64 *m_data_pg_pools;
|
|
u64 m_cas_pg_pool;
|
|
|
|
bool m_enabled;
|
|
bool m_damaged;
|
|
int m_num_laggy;
|
|
char *m_fs_name;
|
|
};
|
|
|
|
static inline struct ceph_entity_addr *
|
|
ceph_mdsmap_get_addr(struct ceph_mdsmap *m, int w)
|
|
{
|
|
if (w >= m->possible_max_rank)
|
|
return NULL;
|
|
return &m->m_info[w].addr;
|
|
}
|
|
|
|
static inline int ceph_mdsmap_get_state(struct ceph_mdsmap *m, int w)
|
|
{
|
|
BUG_ON(w < 0);
|
|
if (w >= m->possible_max_rank)
|
|
return CEPH_MDS_STATE_DNE;
|
|
return m->m_info[w].state;
|
|
}
|
|
|
|
static inline bool ceph_mdsmap_is_laggy(struct ceph_mdsmap *m, int w)
|
|
{
|
|
if (w >= 0 && w < m->possible_max_rank)
|
|
return m->m_info[w].laggy;
|
|
return false;
|
|
}
|
|
|
|
extern int ceph_mdsmap_get_random_mds(struct ceph_mdsmap *m);
|
|
struct ceph_mdsmap *ceph_mdsmap_decode(struct ceph_mds_client *mdsc, void **p,
|
|
void *end, bool msgr2);
|
|
extern void ceph_mdsmap_destroy(struct ceph_mdsmap *m);
|
|
extern bool ceph_mdsmap_is_cluster_available(struct ceph_mdsmap *m);
|
|
|
|
#endif
|