From: Eric Biggers <ebiggers@kernel.org>
To: linux-fscrypt@vger.kernel.org
Cc: linux-ext4@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org,
linux-integrity@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>,
"Theodore Y . Ts'o" <tytso@mit.edu>,
Victor Hsieh <victorhsieh@google.com>,
Chandan Rajendra <chandan@linux.vnet.ibm.com>,
Dave Chinner <david@fromorbit.com>,
Christoph Hellwig <hch@lst.de>,
"Darrick J . Wong" <darrick.wong@oracle.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH v6 06/17] fs-verity: add inode and superblock fields
Date: Mon, 1 Jul 2019 08:32:26 -0700 [thread overview]
Message-ID: <20190701153237.1777-7-ebiggers@kernel.org> (raw)
In-Reply-To: <20190701153237.1777-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
Analogous to fs/crypto/, add fields to the VFS inode and superblock for
use by the fs/verity/ support layer:
- ->s_vop: points to the fsverity_operations if the filesystem supports
fs-verity, otherwise is NULL.
- ->i_verity_info: points to cached fs-verity information for the inode
after someone opens it, otherwise is NULL.
- S_VERITY: bit in ->i_flags that identifies verity inodes, even when
they haven't been opened yet and thus still have NULL ->i_verity_info.
Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
include/linux/fs.h | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index f7fdfe93e25d..a80a192cdcf2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -64,6 +64,8 @@ struct workqueue_struct;
struct iov_iter;
struct fscrypt_info;
struct fscrypt_operations;
+struct fsverity_info;
+struct fsverity_operations;
struct fs_context;
struct fs_parameter_description;
@@ -723,6 +725,10 @@ struct inode {
struct fscrypt_info *i_crypt_info;
#endif
+#ifdef CONFIG_FS_VERITY
+ struct fsverity_info *i_verity_info;
+#endif
+
void *i_private; /* fs or device private pointer */
} __randomize_layout;
@@ -1429,6 +1435,9 @@ struct super_block {
const struct xattr_handler **s_xattr;
#ifdef CONFIG_FS_ENCRYPTION
const struct fscrypt_operations *s_cop;
+#endif
+#ifdef CONFIG_FS_VERITY
+ const struct fsverity_operations *s_vop;
#endif
struct hlist_bl_head s_roots; /* alternate root dentries for NFS */
struct list_head s_mounts; /* list of mounts; _not_ for fs use */
@@ -1964,6 +1973,7 @@ struct super_operations {
#endif
#define S_ENCRYPTED 16384 /* Encrypted file (using fs/crypto/) */
#define S_CASEFOLD 32768 /* Casefolded file */
+#define S_VERITY 65536 /* Verity file (using fs/verity/) */
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
@@ -2005,6 +2015,7 @@ static inline bool sb_rdonly(const struct super_block *sb) { return sb->s_flags
#define IS_DAX(inode) ((inode)->i_flags & S_DAX)
#define IS_ENCRYPTED(inode) ((inode)->i_flags & S_ENCRYPTED)
#define IS_CASEFOLDED(inode) ((inode)->i_flags & S_CASEFOLD)
+#define IS_VERITY(inode) ((inode)->i_flags & S_VERITY)
#define IS_WHITEOUT(inode) (S_ISCHR(inode->i_mode) && \
(inode)->i_rdev == WHITEOUT_DEV)
--
2.22.0
next prev parent reply other threads:[~2019-07-01 15:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 15:32 [PATCH v6 00/17] fs-verity: read-only file-based authenticity protection Eric Biggers
2019-07-01 15:32 ` [PATCH v6 01/17] fs-verity: add a documentation file Eric Biggers
2019-07-01 15:32 ` [PATCH v6 02/17] fs-verity: add MAINTAINERS file entry Eric Biggers
2019-07-01 15:32 ` [PATCH v6 03/17] fs-verity: add UAPI header Eric Biggers
2019-07-01 15:32 ` [PATCH v6 04/17] fs: uapi: define verity bit for FS_IOC_GETFLAGS Eric Biggers
2019-07-01 15:32 ` [PATCH v6 05/17] fs-verity: add Kconfig and the helper functions for hashing Eric Biggers
2019-07-01 15:32 ` Eric Biggers [this message]
2019-07-01 15:32 ` [PATCH v6 07/17] fs-verity: add the hook for file ->open() Eric Biggers
2019-07-01 15:32 ` [PATCH v6 08/17] fs-verity: add the hook for file ->setattr() Eric Biggers
2019-07-01 15:32 ` [PATCH v6 09/17] fs-verity: add data verification hooks for ->readpages() Eric Biggers
2019-07-01 15:32 ` [PATCH v6 10/17] fs-verity: implement FS_IOC_ENABLE_VERITY ioctl Eric Biggers
2019-07-03 20:14 ` Eric Biggers
2019-07-01 15:32 ` [PATCH v6 11/17] fs-verity: implement FS_IOC_MEASURE_VERITY ioctl Eric Biggers
2019-07-01 15:32 ` [PATCH v6 12/17] fs-verity: add SHA-512 support Eric Biggers
2019-07-01 15:32 ` [PATCH v6 13/17] fs-verity: support builtin file signatures Eric Biggers
2019-07-07 18:47 ` Theodore Ts'o
2019-07-01 15:32 ` [PATCH v6 14/17] ext4: add basic fs-verity support Eric Biggers
2019-07-07 18:51 ` Theodore Ts'o
2019-07-01 15:32 ` [PATCH v6 15/17] ext4: add fs-verity read support Eric Biggers
2019-07-07 18:54 ` Theodore Ts'o
2019-07-01 15:32 ` [PATCH v6 16/17] ext4: update on-disk format documentation for fs-verity Eric Biggers
2019-07-07 18:54 ` Theodore Ts'o
2019-07-01 15:32 ` [PATCH v6 17/17] f2fs: add fs-verity support Eric Biggers
2019-07-03 1:25 ` [f2fs-dev] " Chao Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190701153237.1777-7-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=chandan@linux.vnet.ibm.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=jaegeuk@kernel.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=victorhsieh@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).