lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20131206213826.GB10143@birch.djwong.org> Date: Fri, 6 Dec 2013 13:38:26 -0800 From: "Darrick J. Wong" <darrick.wong@...cle.com> To: Zheng Liu <gnehzuil.liu@...il.com> Cc: linux-ext4@...r.kernel.org, "Theodore Ts'o" <tytso@....edu>, Zheng Liu <wenqing.lz@...bao.com> Subject: Re: [PATCH v3 09/30] libext2fs: check inline_data in ext2fs_xattrs_read/write On Fri, Dec 06, 2013 at 05:57:56PM +0800, Zheng Liu wrote: > From: Zheng Liu <wenqing.lz@...bao.com> > > Now on kernel side we can enable inline data even without ext_attr. So > we need to adjust sanity check on ext2fs_xattrs_read/write to let we > access extended attribute when filesystem is create with '-O ^ext_attr, > inline_data'. Oops, I removed both of those checks in favor of looking for ext_attr or inline_data in ext2fs_xattrs_open(). Oh well, sorry about the miscommunication. --D > > Signed-off-by: Zheng Liu <wenqing.lz@...bao.com> > --- > lib/ext2fs/ext_attr.c | 28 ++++++++++++++++++++++------ > 1 file changed, 22 insertions(+), 6 deletions(-) > > diff --git a/lib/ext2fs/ext_attr.c b/lib/ext2fs/ext_attr.c > index 09e13b2..e5e0fa9 100644 > --- a/lib/ext2fs/ext_attr.c > +++ b/lib/ext2fs/ext_attr.c > @@ -469,9 +469,17 @@ errcode_t ext2fs_xattrs_write(struct ext2_xattr_handle *handle) > unsigned int i; > errcode_t err; > > - if (!EXT2_HAS_COMPAT_FEATURE(handle->fs->super, > - EXT2_FEATURE_COMPAT_EXT_ATTR)) > - return 0; > + /* > + * If inline_data is enabled, we don't check ext_attr because > + * inline_data needs to read/write extended attribute even > + * without ext_attr. > + */ > + if (!EXT2_HAS_INCOMPAT_FEATURE(handle->fs->super, > + EXT4_FEATURE_INCOMPAT_INLINE_DATA)) { > + if (!EXT2_HAS_COMPAT_FEATURE(handle->fs->super, > + EXT2_FEATURE_COMPAT_EXT_ATTR)) > + return 0; > + } > > i = EXT2_INODE_SIZE(handle->fs->super); > if (i < sizeof(*inode)) > @@ -684,9 +692,17 @@ errcode_t ext2fs_xattrs_read(struct ext2_xattr_handle *handle) > int i; > errcode_t err; > > - if (!EXT2_HAS_COMPAT_FEATURE(handle->fs->super, > - EXT2_FEATURE_COMPAT_EXT_ATTR)) > - return 0; > + /* > + * If inline_data is enabled, we don't check ext_attr because > + * inline_data needs to read/write extended attribute even > + * without ext_attr. > + */ > + if (!EXT2_HAS_INCOMPAT_FEATURE(handle->fs->super, > + EXT4_FEATURE_INCOMPAT_INLINE_DATA)) { > + if (!EXT2_HAS_COMPAT_FEATURE(handle->fs->super, > + EXT2_FEATURE_COMPAT_EXT_ATTR)) > + return 0; > + } > > i = EXT2_INODE_SIZE(handle->fs->super); > if (i < sizeof(*inode)) > -- > 1.7.9.7 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@...r.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists