David Howells 874c8ca1e6
netfs: Fix gcc-12 warning by embedding vfs inode in netfs_i_context ...
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 commit 507160f46cbc899ee1c8jlayton@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 >
2022-06-09 13:55:00 -07:00
2022-05-24 19:55:07 -07:00
2022-03-20 11:03:41 -05:00
2022-04-12 22:24:46 -04:00
2022-05-17 15:33:21 -04:00
2020-05-05 09:22:24 -06:00
2020-07-13 11:28:12 -06:00
2020-03-02 13:58:44 -07:00
2020-08-31 12:20:31 +02:00
2021-01-21 14:06:00 -07:00
2021-09-07 08:39:40 -06:00
2020-07-05 14:44:29 -06:00
2021-11-15 02:54:37 -07:00
2020-05-05 09:22:21 -06:00
2020-03-02 14:01:25 -07:00
2020-03-02 14:01:26 -07:00
2020-03-02 14:01:28 -07:00
2022-01-13 13:40:06 +01:00
2020-07-13 10:02:32 -06:00
2020-07-05 14:44:29 -06:00
2020-03-02 14:02:07 -07:00
2022-03-16 09:38:38 +08:00
2021-05-21 20:59:03 +02:00
2020-05-05 09:22:21 -06:00
2020-07-05 14:44:29 -06:00
2020-08-07 11:33:22 -07:00
2020-05-05 09:22:22 -06:00
2020-03-20 17:01:29 -06:00
2020-05-25 18:59:59 -06:00
2022-05-29 15:39:04 +08:00
2021-06-13 17:02:46 -06:00
2020-03-02 14:03:16 -07:00
2022-04-20 11:16:43 -07:00
2020-06-05 16:19:28 -07:00
2020-12-10 12:40:07 -06:00
2022-05-09 16:21:44 -04:00
2022-05-24 19:55:07 -07:00
2020-05-05 09:22:22 -06:00
2020-09-04 11:32:10 +02:00
2020-06-02 19:45:05 +02:00
2020-03-02 14:03:35 -07:00
2020-12-01 00:25:20 +01:00
2020-06-26 11:14:12 -06:00
2020-03-02 14:03:47 -07:00
2020-06-26 11:14:12 -06:00
2022-05-09 11:20:43 +02:00
2021-10-05 06:02:53 -04:00
2020-03-02 14:03:55 -07:00
2020-03-02 14:04:06 -07:00
2020-11-06 23:01:03 -05:00
2022-05-26 20:52:24 -07:00
2021-10-19 06:48:21 -04:00
2020-12-03 15:53:13 -07:00
2022-06-09 13:55:00 -07:00
2020-03-02 14:04:06 -07:00
2021-09-20 18:53:12 +03:00
2020-03-02 14:04:06 -07:00
2020-03-02 14:04:06 -07:00
2020-08-07 11:33:22 -07:00
2020-07-13 11:24:43 -06:00
2020-04-28 12:35:47 -06:00
2021-08-17 11:47:44 +02:00
2021-07-03 11:41:14 -07:00
2020-06-08 09:30:19 -06:00
2022-05-08 14:28:18 -04:00
2022-05-26 12:32:41 -07:00
2020-04-07 13:20:56 -06:00
2020-07-09 08:14:01 +02:00
2021-07-18 23:48:14 +09:00
2020-03-02 14:04:41 -07:00
2020-03-02 14:04:41 -07:00
2021-02-26 09:41:05 -08:00
2020-05-05 09:22:23 -06:00
2020-03-02 14:04:41 -07:00
2020-10-14 16:09:32 -07:00
2020-03-02 14:04:41 -07:00
2020-12-15 12:13:39 -08:00
2020-09-09 11:53:33 -06:00
2020-03-02 14:04:41 -07:00
2020-07-14 14:37:39 +02:00
2021-03-25 11:51:23 -06:00
2022-05-26 12:32:41 -07:00
2020-04-20 17:01:34 +02:00
2020-05-05 09:22:24 -06:00
2020-06-02 19:21:40 -07:00
2022-04-26 14:53:06 +09:00
874c8ca1e6