Fix misaligned ovl_fh
Subsystems (2)
Amir Goldstein
maintainerv2 cover Fix misaligned ovl_fh
Miklos,
Beyond the regular tests, this has also been tortured
with my ovl-nested patches and tests.
Those have been very useful in flushing out nfs export bugs in the past and they have also flushed out a few bugs from the RFC patch I sent yesterday.
Thanks,
Amir.
Changes since RFC:
- Fix bug in ovl_verify_index()
- Open code ovl_dentry_to_fh() [Al]
- Zero buffer in ovl_encode_real_fh() [Al]
- Support decoding old (misaligned) file handles from the wire [Al]
- Add patch to simplify memory allocation in ovl_encode_real_fh() [Al]
Amir Goldstein (2):
ovl: make sure that real fid is 32bit aligned in memory
ovl: don't use a temp buf for encoding real fh
fs/overlayfs/copy_up.c | 53 +++++++++++++------------- fs/overlayfs/export.c | 80 ++++++++++++++++++++++++---------------- fs/overlayfs/namei.c | 44 +++++++++++----------- fs/overlayfs/overlayfs.h | 34 ++++++++++++++--- 4 files changed, 124 insertions(+), 87 deletions(-)
Signature · 1 line
2.17.1
Amir Goldstein
maintainerPATCH v2 1/2 ovl: make sure that real fid is 32bit aligned in memory
Seprate on-disk encoding from in-memory and on-wire resresentation of overlay file handle.
In-memory and on-wire we only ever pass around pointers to struct ovl_fh, which encapsulates at offset 3 the on-disk format struct ovl_fb. struct ovl_fb encapsulates at offset 21 the real file handle. That makes sure that the real file handle is always 32bit aligned in-memory when passed down to the underlying filesystem.
On-disk format remains the same and store/load are done into correctly aligned buffer.
New nfs exported file handles are exported with aligned real fid. Old nfs file handles are copied to an aligned buffer before being decoded.
--- fs/overlayfs/copy_up.c | 30 ++++++++------- fs/overlayfs/export.c | 80 ++++++++++++++++++++++++---------------- fs/overlayfs/namei.c | 44 +++++++++++----------- fs/overlayfs/overlayfs.h | 34 ++++++++++++++--- 4 files changed, 115 insertions(+), 73 deletions(-)
fs/overlayfs/copy_up.c +16 -14
@@ -251,18 +251,20 @@ struct ovl_fh *ovl_encode_real_fh(struct dentry *real, bool is_upper) WARN_ON(fh_type == FILEID_INVALID)) goto out; -BUILD_BUG_ON (MAX_HANDLE_SZ + offsetof(struct ovl_fh , fid) >255 ); - fh_len = offsetof(struct ovl_fh , fid) + buflen; - fh =kmalloc (fh_len,GFP_KERNEL ); +/* Make sure the real fid stays 32bit aligned */ +BUILD_BUG_ON (OVL_FH_FID_OFFSET %4 ); +BUILD_BUG_ON (MAX_HANDLE_SZ +OVL_FH_FID_OFFSET >255 ); + fh_len =OVL_FH_FID_OFFSET + buflen; + fh =kzalloc (fh_len,GFP_KERNEL );if (!fh) { fh =ERR_PTR (-ENOMEM ); goto out; } - fh->version =OVL_FH_VERSION ; - fh->magic =OVL_FH_MAGIC ; - fh->type = fh_type; - fh->flags =OVL_FH_FLAG_CPU_ENDIAN ; + fh->fb.version =OVL_FH_VERSION ; + fh->fb.magic =OVL_FH_MAGIC ; + fh->fb.type = fh_type; + fh->fb.flags =OVL_FH_FLAG_CPU_ENDIAN ;/* * When we will want to decode an overlay dentry from this handle * and all layers are on the same fs, if we get a disconncted real
@@ -270,10 +272,10 @@ struct ovl_fh *ovl_encode_real_fh(struct dentry *real, bool is_upper)* it to upperdentry or to lowerstack is by checking this flag. */ if (is_upper) - fh->flags |=OVL_FH_FLAG_PATH_UPPER ; - fh->len = fh_len; - fh->uuid = *uuid; -memcpy (fh->fid, buf, buflen); + fh->fb.flags |=OVL_FH_FLAG_PATH_UPPER ; + fh->fb.len = fh_len -OVL_FH_WIRE_OFFSET ; + fh->fb.uuid = *uuid; +memcpy (fh->fb.fid, buf, buflen); out:kfree (buf);
@@ -300,8 +302,8 @@ int ovl_set_origin(struct dentry *dentry, struct dentry *lower,/* * Do not fail when upper doesn't support xattrs. */ - err =ovl_check_setxattr (dentry, upper,OVL_XATTR_ORIGIN , fh, - fh ? fh->len :0 ,0 ); + err =ovl_check_setxattr (dentry, upper,OVL_XATTR_ORIGIN , fh->buf, + fh ? fh->fb.len :0 ,0 );kfree (fh);return err;
@@ -317,7 +319,7 @@ static int ovl_set_upper_fh(struct dentry *upper, struct dentry *index)if (IS_ERR (fh))return PTR_ERR (fh); - err =ovl_do_setxattr (index,OVL_XATTR_UPPER , fh, fh->len,0 ); + err =ovl_do_setxattr (index,OVL_XATTR_UPPER , fh->buf, fh->fb.len,0 );kfree (fh);return err;
fs/overlayfs/export.c +49 -31
147 lines not on this page · raw message
fs/overlayfs/namei.c +22 -22
122 lines not on this page · raw message
fs/overlayfs/overlayfs.h +28 -6
@@ -71,20 +71,36 @@ enum ovl_entry_flag {#error Endianness not defined#endif -/* The type returned by overlay exportfs ops when encoding an ovl_fh handle */ -#define OVL_FILEID 0xfb +/* The type used to be returned by overlay exportfs for misaligned fid */ +#define OVL_FILEID_V0 0xfb +/* The type returned by overlay exportfs for 32bit aligned fid */ +#define OVL_FILEID_V1 0xf8 -/* On-disk and in-memeory format for redirect by file handle */ -struct ovl_fh { +/* On-disk format for "origin" file handle */ +struct ovl_fb {u8 version;/* 0 */ u8 magic;/* 0xfb */ u8 len;/* size of this header + size of fid */ u8 flags;/* OVL_FH_FLAG_* */ u8 type;/* fid_type of fid */ uuid_t uuid;/* uuid of filesystem */ -u8 fid[0 ];/* file identifier */ +u32 fid[0 ];/* file identifier should be 32bit aligned in-memory */ } __packed; +/* In-memory and on-wire format for overlay file handle */ +struct ovl_fh { +u8 padding[3 ];/* make sure fb.fid is 32bit aligned */ +union { +struct ovl_fb fb; +u8 buf[0 ]; + }; +} __packed; + +#define OVL_FH_WIRE_OFFSET offsetof(struct ovl_fh, fb) +#define OVL_FH_LEN (fh) (OVL_FH_WIRE_OFFSET + (fh)->fb.len) +#define OVL_FH_FID_OFFSET (OVL_FH_WIRE_OFFSET + \ + offsetof(struct ovl_fb, fid)) +static inline int ovl_do_rmdir (struct inode *dir,struct dentry *dentry) {int err =vfs_rmdir (dir, dentry);
@@ -302,7 +318,13 @@ static inline void ovl_inode_unlock(struct inode *inode)/* namei.c */ -int ovl_check_fh_len (struct ovl_fh *fh,int fh_len); +int ovl_check_fb_len (struct ovl_fb *fb,int fb_len); + +static inline int ovl_check_fh_len (struct ovl_fh *fh,int fh_len) +{ +return ovl_check_fb_len (&fh->fb, fh_len -OVL_FH_WIRE_OFFSET ); +} +struct dentry *ovl_decode_real_fh (struct ovl_fh *fh,struct vfsmount *mnt,bool connected); int ovl_check_origin_fh(struct ovl_fs *ofs, struct ovl_fh *fh, bool connected,
Signature · 1 line
2.17.1
Amir Goldstein
maintainerPATCH v2 2/2 ovl: don't use a temp buf for encoding real fh
In reply to Amir GoldsteinWe can allocate maximum fh size and encode into it directly.
--- fs/overlayfs/copy_up.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-)
fs/overlayfs/copy_up.c +16 -21
@@ -227,13 +227,17 @@ int ovl_set_attr(struct dentry *upperdentry, struct kstat *stat)struct ovl_fh *ovl_encode_real_fh (struct dentry *real,bool is_upper) {struct ovl_fh *fh; -int fh_type, fh_len, dwords; -void *buf; +int fh_type, dwords;int buflen =MAX_HANDLE_SZ ;uuid_t *uuid = &real->d_sb->s_uuid; +int err; - buf =kmalloc (buflen,GFP_KERNEL ); -if (!buf) +/* Make sure the real fid stays 32bit aligned */ +BUILD_BUG_ON (OVL_FH_FID_OFFSET %4 ); +BUILD_BUG_ON (MAX_HANDLE_SZ +OVL_FH_FID_OFFSET >255 ); + + fh =kzalloc (buflen +OVL_FH_FID_OFFSET ,GFP_KERNEL ); +if (!fh)return ERR_PTR (-ENOMEM );/*
@@ -242,24 +246,14 @@ struct ovl_fh *ovl_encode_real_fh(struct dentry *real, bool is_upper)* the price or reconnecting the dentry. */ dwords = buflen >>2 ; - fh_type =exportfs_encode_fh (real, buf, &dwords,0 ); + fh_type =exportfs_encode_fh (real, (void *)fh->fb.fid, &dwords,0 ); buflen = (dwords <<2 ); - fh =ERR_PTR (-EIO ); + err = -EIO ;if (WARN_ON (fh_type <0 ) ||WARN_ON (buflen >MAX_HANDLE_SZ ) ||WARN_ON (fh_type ==FILEID_INVALID )) - goto out; - -/* Make sure the real fid stays 32bit aligned */ -BUILD_BUG_ON (OVL_FH_FID_OFFSET %4 ); -BUILD_BUG_ON (MAX_HANDLE_SZ +OVL_FH_FID_OFFSET >255 ); - fh_len =OVL_FH_FID_OFFSET + buflen; - fh =kzalloc (fh_len,GFP_KERNEL ); -if (!fh) { - fh =ERR_PTR (-ENOMEM ); - goto out; - } + goto out_err; fh->fb.version =OVL_FH_VERSION ; fh->fb.magic =OVL_FH_MAGIC ;
@@ -273,13 +267,14 @@ struct ovl_fh *ovl_encode_real_fh(struct dentry *real, bool is_upper)*/ if (is_upper) fh->fb.flags |=OVL_FH_FLAG_PATH_UPPER ; - fh->fb.len = fh_len -OVL_FH_WIRE_OFFSET ; + fh->fb.len =sizeof (fh->fb) + buflen; fh->fb.uuid = *uuid; -memcpy (fh->fb.fid, buf, buflen); -out: -kfree (buf);return fh; + +out_err: +kfree (fh); +return ERR_PTR (err); } int ovl_set_origin(struct dentry *dentry, struct dentry *lower,
Signature · 1 line
2.17.1