diff options
author | gVisor bot <gvisor-bot@google.com> | 2021-10-08 22:44:38 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-10-08 22:44:38 +0000 |
commit | 0927c63f8ea75dcabf909015e5ed28532b1e8549 (patch) | |
tree | 4dfc1001389d381f866b2ef21f769e39c15d0879 /pkg/sentry | |
parent | c5b6f080367328a16f0820e00203c7a1322b84cc (diff) | |
parent | 34e68b6b4ff04de5c7b5e2dc46e5bd44c6845e63 (diff) |
Merge release-20210927.0-52-g34e68b6b4 (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r-- | pkg/sentry/fsimpl/gofer/gofer.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkg/sentry/fsimpl/gofer/gofer.go b/pkg/sentry/fsimpl/gofer/gofer.go index 2dd9226c1..b98825e26 100644 --- a/pkg/sentry/fsimpl/gofer/gofer.go +++ b/pkg/sentry/fsimpl/gofer/gofer.go @@ -2049,16 +2049,7 @@ func (d *dentry) listXattr(ctx context.Context, size uint64) ([]string, error) { } if d.fs.opts.lisaEnabled { - xattrs, err := d.controlFDLisa.ListXattr(ctx, size) - if err != nil { - return nil, err - } - - res := make([]string, 0, len(xattrs)) - for _, xattr := range xattrs { - res = append(res, xattr) - } - return res, nil + return d.controlFDLisa.ListXattr(ctx, size) } xattrMap, err := d.file.listXattr(ctx, size) |