From 33006cdf9c038dca9b3d4c148a509de851a66ea9 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 29 Mar 2017 14:02:19 -0700 Subject: [PATCH] ovl: Use designated initializers Prepare to mark sensitive kernel structures for randomization by making sure they're using designated initializers. These were identified during allyesconfig builds of x86, arm, and arm64, with most initializer fixes extracted from grsecurity. For these cases, use { }, which will be zero-filled, instead of undesignated NULLs. Signed-off-by: Kees Cook Signed-off-by: Miklos Szeredi --- fs/overlayfs/super.c | 4 ++-- fs/overlayfs/util.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index c9e70d39c1ea..07c8793efb1d 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -709,8 +709,8 @@ static const struct xattr_handler *ovl_xattr_handlers[] = { static int ovl_fill_super(struct super_block *sb, void *data, int silent) { - struct path upperpath = { NULL, NULL }; - struct path workpath = { NULL, NULL }; + struct path upperpath = { }; + struct path workpath = { }; struct dentry *root_dentry; struct inode *realinode; struct ovl_entry *oe; diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index 1953986ee6bc..35b8959db5ee 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -101,7 +101,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path) { struct ovl_entry *oe = dentry->d_fsdata; - *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL }; + *path = oe->numlower ? oe->lowerstack[0] : (struct path) { }; } enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path) -- 2.20.1