mirror of
https://github.com/torvalds/linux.git
synced 2024-12-18 00:53:40 +00:00
874c8ca1e6
While randstruct was satisfied with using an open-coded "void *" offset cast for the netfs_i_context <-> inode casting, __builtin_object_size() as used by FORTIFY_SOURCE was not as easily fooled. This was causing the following complaint[1] from gcc v12: In file included from include/linux/string.h:253, from include/linux/ceph/ceph_debug.h:7, from fs/ceph/inode.c:2: In function 'fortify_memset_chk', inlined from 'netfs_i_context_init' at include/linux/netfs.h:326:2, inlined from 'ceph_alloc_inode' at fs/ceph/inode.c:463:2: include/linux/fortify-string.h:242:25: warning: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Wattribute-warning] 242 | __write_overflow_field(p_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fix this by embedding a struct inode into struct netfs_i_context (which should perhaps be renamed to struct netfs_inode). The struct inode vfs_inode fields are then removed from the 9p, afs, ceph and cifs inode structs and vfs_inode is then simply changed to "netfs.inode" in those filesystems. Further, rename netfs_i_context to netfs_inode, get rid of the netfs_inode() function that converted a netfs_i_context pointer to an inode pointer (that can now be done with &ctx->inode) and rename the netfs_i_context() function to netfs_inode() (which is now a wrapper around container_of()). Most of the changes were done with: perl -p -i -e 's/vfs_inode/netfs.inode/'g \ `git grep -l 'vfs_inode' -- fs/{9p,afs,ceph,cifs}/*.[ch]` Kees suggested doing it with a pair structure[2] and a special declarator to insert that into the network filesystem's inode wrapper[3], but I think it's cleaner to embed it - and then it doesn't matter if struct randomisation reorders things. Dave Chinner suggested using a filesystem-specific VFS_I() function in each filesystem to convert that filesystem's own inode wrapper struct into the VFS inode struct[4]. Version #2: - Fix a couple of missed name changes due to a disabled cifs option. - Rename nfs_i_context to nfs_inode - Use "netfs" instead of "nic" as the member name in per-fs inode wrapper structs. [ This also undoes commit507160f46c
("netfs: gcc-12: temporarily disable '-Wattribute-warning' for now") that is no longer needed ] Fixes:bc899ee1c8
("netfs: Add a netfs inode context") Reported-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Xiubo Li <xiubli@redhat.com> cc: Jonathan Corbet <corbet@lwn.net> cc: Eric Van Hensbergen <ericvh@gmail.com> cc: Latchesar Ionkov <lucho@ionkov.net> cc: Dominique Martinet <asmadeus@codewreck.org> cc: Christian Schoenebeck <linux_oss@crudebyte.com> cc: Marc Dionne <marc.dionne@auristor.com> cc: Ilya Dryomov <idryomov@gmail.com> cc: Steve French <smfrench@gmail.com> cc: William Kucharski <william.kucharski@oracle.com> cc: "Matthew Wilcox (Oracle)" <willy@infradead.org> cc: Dave Chinner <david@fromorbit.com> cc: linux-doc@vger.kernel.org cc: v9fs-developer@lists.sourceforge.net cc: linux-afs@lists.infradead.org cc: ceph-devel@vger.kernel.org cc: linux-cifs@vger.kernel.org cc: samba-technical@lists.samba.org cc: linux-fsdevel@vger.kernel.org cc: linux-hardening@vger.kernel.org Link: https://lore.kernel.org/r/d2ad3a3d7bdd794c6efb562d2f2b655fb67756b9.camel@kernel.org/ [1] Link: https://lore.kernel.org/r/20220517210230.864239-1-keescook@chromium.org/ [2] Link: https://lore.kernel.org/r/20220518202212.2322058-1-keescook@chromium.org/ [3] Link: https://lore.kernel.org/r/20220524101205.GI2306852@dread.disaster.area/ [4] Link: https://lore.kernel.org/r/165296786831.3591209.12111293034669289733.stgit@warthog.procyon.org.uk/ # v1 Link: https://lore.kernel.org/r/165305805651.4094995.7763502506786714216.stgit@warthog.procyon.org.uk # v2 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
233 lines
7.2 KiB
C
233 lines
7.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* V9FS definitions.
|
|
*
|
|
* Copyright (C) 2004-2008 by Eric Van Hensbergen <ericvh@gmail.com>
|
|
* Copyright (C) 2002 by Ron Minnich <rminnich@lanl.gov>
|
|
*/
|
|
#ifndef FS_9P_V9FS_H
|
|
#define FS_9P_V9FS_H
|
|
|
|
#include <linux/backing-dev.h>
|
|
#include <linux/netfs.h>
|
|
|
|
/**
|
|
* enum p9_session_flags - option flags for each 9P session
|
|
* @V9FS_PROTO_2000U: whether or not to use 9P2000.u extensions
|
|
* @V9FS_PROTO_2000L: whether or not to use 9P2000.l extensions
|
|
* @V9FS_ACCESS_SINGLE: only the mounting user can access the hierarchy
|
|
* @V9FS_ACCESS_USER: a new attach will be issued for every user (default)
|
|
* @V9FS_ACCESS_CLIENT: Just like user, but access check is performed on client.
|
|
* @V9FS_ACCESS_ANY: use a single attach for all users
|
|
* @V9FS_ACCESS_MASK: bit mask of different ACCESS options
|
|
* @V9FS_POSIX_ACL: POSIX ACLs are enforced
|
|
*
|
|
* Session flags reflect options selected by users at mount time
|
|
*/
|
|
#define V9FS_ACCESS_ANY (V9FS_ACCESS_SINGLE | \
|
|
V9FS_ACCESS_USER | \
|
|
V9FS_ACCESS_CLIENT)
|
|
#define V9FS_ACCESS_MASK V9FS_ACCESS_ANY
|
|
#define V9FS_ACL_MASK V9FS_POSIX_ACL
|
|
|
|
enum p9_session_flags {
|
|
V9FS_PROTO_2000U = 0x01,
|
|
V9FS_PROTO_2000L = 0x02,
|
|
V9FS_ACCESS_SINGLE = 0x04,
|
|
V9FS_ACCESS_USER = 0x08,
|
|
V9FS_ACCESS_CLIENT = 0x10,
|
|
V9FS_POSIX_ACL = 0x20
|
|
};
|
|
|
|
/* possible values of ->cache */
|
|
/**
|
|
* enum p9_cache_modes - user specified cache preferences
|
|
* @CACHE_NONE: do not cache data, dentries, or directory contents (default)
|
|
* @CACHE_LOOSE: cache data, dentries, and directory contents w/no consistency
|
|
*
|
|
* eventually support loose, tight, time, session, default always none
|
|
*/
|
|
|
|
enum p9_cache_modes {
|
|
CACHE_NONE,
|
|
CACHE_MMAP,
|
|
CACHE_LOOSE,
|
|
CACHE_FSCACHE,
|
|
nr__p9_cache_modes
|
|
};
|
|
|
|
/**
|
|
* struct v9fs_session_info - per-instance session information
|
|
* @flags: session options of type &p9_session_flags
|
|
* @nodev: set to 1 to disable device mapping
|
|
* @debug: debug level
|
|
* @afid: authentication handle
|
|
* @cache: cache mode of type &p9_cache_modes
|
|
* @cachetag: the tag of the cache associated with this session
|
|
* @fscache: session cookie associated with FS-Cache
|
|
* @uname: string user name to mount hierarchy as
|
|
* @aname: mount specifier for remote hierarchy
|
|
* @maxdata: maximum data to be sent/recvd per protocol message
|
|
* @dfltuid: default numeric userid to mount hierarchy as
|
|
* @dfltgid: default numeric groupid to mount hierarchy as
|
|
* @uid: if %V9FS_ACCESS_SINGLE, the numeric uid which mounted the hierarchy
|
|
* @clnt: reference to 9P network client instantiated for this session
|
|
* @slist: reference to list of registered 9p sessions
|
|
*
|
|
* This structure holds state for each session instance established during
|
|
* a sys_mount() .
|
|
*
|
|
* Bugs: there seems to be a lot of state which could be condensed and/or
|
|
* removed.
|
|
*/
|
|
|
|
struct v9fs_session_info {
|
|
/* options */
|
|
unsigned char flags;
|
|
unsigned char nodev;
|
|
unsigned short debug;
|
|
unsigned int afid;
|
|
unsigned int cache;
|
|
#ifdef CONFIG_9P_FSCACHE
|
|
char *cachetag;
|
|
struct fscache_volume *fscache;
|
|
#endif
|
|
|
|
char *uname; /* user name to mount as */
|
|
char *aname; /* name of remote hierarchy being mounted */
|
|
unsigned int maxdata; /* max data for client interface */
|
|
kuid_t dfltuid; /* default uid/muid for legacy support */
|
|
kgid_t dfltgid; /* default gid for legacy support */
|
|
kuid_t uid; /* if ACCESS_SINGLE, the uid that has access */
|
|
struct p9_client *clnt; /* 9p client */
|
|
struct list_head slist; /* list of sessions registered with v9fs */
|
|
struct rw_semaphore rename_sem;
|
|
long session_lock_timeout; /* retry interval for blocking locks */
|
|
};
|
|
|
|
/* cache_validity flags */
|
|
#define V9FS_INO_INVALID_ATTR 0x01
|
|
|
|
struct v9fs_inode {
|
|
struct netfs_inode netfs; /* Netfslib context and vfs inode */
|
|
struct p9_qid qid;
|
|
unsigned int cache_validity;
|
|
struct p9_fid *writeback_fid;
|
|
struct mutex v_mutex;
|
|
};
|
|
|
|
static inline struct v9fs_inode *V9FS_I(const struct inode *inode)
|
|
{
|
|
return container_of(inode, struct v9fs_inode, netfs.inode);
|
|
}
|
|
|
|
static inline struct fscache_cookie *v9fs_inode_cookie(struct v9fs_inode *v9inode)
|
|
{
|
|
#ifdef CONFIG_9P_FSCACHE
|
|
return netfs_i_cookie(&v9inode->netfs.inode);
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
static inline struct fscache_volume *v9fs_session_cache(struct v9fs_session_info *v9ses)
|
|
{
|
|
#ifdef CONFIG_9P_FSCACHE
|
|
return v9ses->fscache;
|
|
#else
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
|
|
extern int v9fs_show_options(struct seq_file *m, struct dentry *root);
|
|
|
|
struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,
|
|
const char *dev_name, char *data);
|
|
extern void v9fs_session_close(struct v9fs_session_info *v9ses);
|
|
extern void v9fs_session_cancel(struct v9fs_session_info *v9ses);
|
|
extern void v9fs_session_begin_cancel(struct v9fs_session_info *v9ses);
|
|
extern struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
|
|
unsigned int flags);
|
|
extern int v9fs_vfs_unlink(struct inode *i, struct dentry *d);
|
|
extern int v9fs_vfs_rmdir(struct inode *i, struct dentry *d);
|
|
extern int v9fs_vfs_rename(struct user_namespace *mnt_userns,
|
|
struct inode *old_dir, struct dentry *old_dentry,
|
|
struct inode *new_dir, struct dentry *new_dentry,
|
|
unsigned int flags);
|
|
extern struct inode *v9fs_inode_from_fid(struct v9fs_session_info *v9ses,
|
|
struct p9_fid *fid,
|
|
struct super_block *sb, int new);
|
|
extern const struct inode_operations v9fs_dir_inode_operations_dotl;
|
|
extern const struct inode_operations v9fs_file_inode_operations_dotl;
|
|
extern const struct inode_operations v9fs_symlink_inode_operations_dotl;
|
|
extern const struct netfs_request_ops v9fs_req_ops;
|
|
extern struct inode *v9fs_inode_from_fid_dotl(struct v9fs_session_info *v9ses,
|
|
struct p9_fid *fid,
|
|
struct super_block *sb, int new);
|
|
|
|
/* other default globals */
|
|
#define V9FS_PORT 564
|
|
#define V9FS_DEFUSER "nobody"
|
|
#define V9FS_DEFANAME ""
|
|
#define V9FS_DEFUID KUIDT_INIT(-2)
|
|
#define V9FS_DEFGID KGIDT_INIT(-2)
|
|
|
|
static inline struct v9fs_session_info *v9fs_inode2v9ses(struct inode *inode)
|
|
{
|
|
return inode->i_sb->s_fs_info;
|
|
}
|
|
|
|
static inline struct v9fs_session_info *v9fs_dentry2v9ses(struct dentry *dentry)
|
|
{
|
|
return dentry->d_sb->s_fs_info;
|
|
}
|
|
|
|
static inline int v9fs_proto_dotu(struct v9fs_session_info *v9ses)
|
|
{
|
|
return v9ses->flags & V9FS_PROTO_2000U;
|
|
}
|
|
|
|
static inline int v9fs_proto_dotl(struct v9fs_session_info *v9ses)
|
|
{
|
|
return v9ses->flags & V9FS_PROTO_2000L;
|
|
}
|
|
|
|
/**
|
|
* v9fs_get_inode_from_fid - Helper routine to populate an inode by
|
|
* issuing a attribute request
|
|
* @v9ses: session information
|
|
* @fid: fid to issue attribute request for
|
|
* @sb: superblock on which to create inode
|
|
*
|
|
*/
|
|
static inline struct inode *
|
|
v9fs_get_inode_from_fid(struct v9fs_session_info *v9ses, struct p9_fid *fid,
|
|
struct super_block *sb)
|
|
{
|
|
if (v9fs_proto_dotl(v9ses))
|
|
return v9fs_inode_from_fid_dotl(v9ses, fid, sb, 0);
|
|
else
|
|
return v9fs_inode_from_fid(v9ses, fid, sb, 0);
|
|
}
|
|
|
|
/**
|
|
* v9fs_get_new_inode_from_fid - Helper routine to populate an inode by
|
|
* issuing a attribute request
|
|
* @v9ses: session information
|
|
* @fid: fid to issue attribute request for
|
|
* @sb: superblock on which to create inode
|
|
*
|
|
*/
|
|
static inline struct inode *
|
|
v9fs_get_new_inode_from_fid(struct v9fs_session_info *v9ses, struct p9_fid *fid,
|
|
struct super_block *sb)
|
|
{
|
|
if (v9fs_proto_dotl(v9ses))
|
|
return v9fs_inode_from_fid_dotl(v9ses, fid, sb, 1);
|
|
else
|
|
return v9fs_inode_from_fid(v9ses, fid, sb, 1);
|
|
}
|
|
|
|
#endif
|