diff options
author | Jakob Unterwurzacher | 2021-06-02 14:21:30 +0200 |
---|---|---|
committer | Jakob Unterwurzacher | 2021-06-02 14:29:48 +0200 |
commit | 04858ddd222bbf7156f33f99cfb293a9b1e15ec8 (patch) | |
tree | 732cbf83c9d842a911d515abbad7c153c4159354 /internal/fusefrontend/node_xattr.go | |
parent | 242cdf966f262b2e20785eb0ff49ac55a8bd4636 (diff) |
nametransform: check name validity on encryption
xfstests generic/523 discovered that we allowed to set
xattrs with "/" in the name, but did not allow to read
them later.
With this change we do not allow to set them in the first
place.
Diffstat (limited to 'internal/fusefrontend/node_xattr.go')
-rw-r--r-- | internal/fusefrontend/node_xattr.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/internal/fusefrontend/node_xattr.go b/internal/fusefrontend/node_xattr.go index 3855b55..925dcbf 100644 --- a/internal/fusefrontend/node_xattr.go +++ b/internal/fusefrontend/node_xattr.go @@ -56,12 +56,14 @@ func (n *Node) Getxattr(ctx context.Context, attr string, dest []byte) (uint32, } } else { // encrypted user xattr - cAttr := rn.encryptXattrName(attr) + cAttr, err := rn.encryptXattrName(attr) + if err != nil { + return minus1, syscall.EIO + } cData, errno := n.getXAttr(cAttr) if errno != 0 { return 0, errno } - var err error data, err = rn.decryptXattrValue(cData) if err != nil { tlog.Warn.Printf("GetXAttr: %v", err) @@ -91,7 +93,10 @@ func (n *Node) Setxattr(ctx context.Context, attr string, data []byte, flags uin return n.setXAttr(attr, data, flags) } - cAttr := rn.encryptXattrName(attr) + cAttr, err := rn.encryptXattrName(attr) + if err != nil { + return syscall.EINVAL + } cData := rn.encryptXattrValue(data) return n.setXAttr(cAttr, cData, flags) } @@ -107,7 +112,10 @@ func (n *Node) Removexattr(ctx context.Context, attr string) syscall.Errno { return n.removeXAttr(attr) } - cAttr := rn.encryptXattrName(attr) + cAttr, err := rn.encryptXattrName(attr) + if err != nil { + return syscall.EINVAL + } return n.removeXAttr(cAttr) } |