From 492d80d4d3ca98a570e259ea1e11d123b78b1cfa Mon Sep 17 00:00:00 2001
From: Greg <gco@jazzhaiku.com>
Date: Tue, 1 Feb 2022 16:46:49 -0800
Subject: [PATCH] Fix closing file descriptors twice (#62)

Closing the fd's in this code after using them to create new os.File objects results in the fd being closed twice with disastrous results in multi-threaded code.  os.File already arranges for its finalizer to close the fd.

Found via restic tests.
---
 xattr_solaris.go | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/xattr_solaris.go b/xattr_solaris.go
index 7213acc..cbd527e 100644
--- a/xattr_solaris.go
+++ b/xattr_solaris.go
@@ -23,14 +23,14 @@ const (
 )
 
 func getxattr(path string, name string, data []byte) (int, error) {
-	fd, err := unix.Open(path, unix.O_RDONLY, 0)
+	f, err := os.OpenFile(path, os.O_RDONLY, 0)
 	if err != nil {
 		return 0, err
 	}
 	defer func() {
-		_ = unix.Close(fd)
+		_ = f.Close()
 	}()
-	return fgetxattr(os.NewFile(uintptr(fd), path), name, data)
+	return fgetxattr(f, name, data)
 }
 
 func lgetxattr(path string, name string, data []byte) (int, error) {
@@ -49,15 +49,16 @@ func fgetxattr(f *os.File, name string, data []byte) (int, error) {
 }
 
 func setxattr(path string, name string, data []byte, flags int) error {
-	fd, err := unix.Open(path, unix.O_RDONLY, 0)
+	f, err := os.OpenFile(path, os.O_RDONLY, 0)
 	if err != nil {
 		return err
 	}
-	if err = fsetxattr(os.NewFile(uintptr(fd), path), name, data, flags); err != nil {
-		_ = unix.Close(fd)
+	err = fsetxattr(f, name, data, flags)
+	if err != nil {
+		_ = f.Close()
 		return err
 	}
-	return unix.Close(fd)
+	return f.Close()
 }
 
 func lsetxattr(path string, name string, data []byte, flags int) error {
@@ -89,10 +90,11 @@ func removexattr(path string, name string) error {
 	if err != nil {
 		return err
 	}
+	f := os.NewFile(uintptr(fd), path);
 	defer func() {
-		_ = unix.Close(fd)
+		_ = f.Close()
 	}()
-	return fremovexattr(os.NewFile(uintptr(fd), path), name)
+	return fremovexattr(f, name)
 }
 
 func lremovexattr(path string, name string) error {
@@ -111,14 +113,14 @@ func fremovexattr(f *os.File, name string) error {
 }
 
 func listxattr(path string, data []byte) (int, error) {
-	fd, err := unix.Open(path, unix.O_RDONLY, 0)
+	f, err := os.OpenFile(path, os.O_RDONLY, 0)
 	if err != nil {
 		return 0, err
 	}
 	defer func() {
-		_ = unix.Close(fd)
+		_ = f.Close()
 	}()
-	return flistxattr(os.NewFile(uintptr(fd), path), data)
+	return flistxattr(f, data)
 }
 
 func llistxattr(path string, data []byte) (int, error) {
@@ -130,10 +132,11 @@ func flistxattr(f *os.File, data []byte) (int, error) {
 	if err != nil {
 		return 0, err
 	}
+	xf := os.NewFile(uintptr(fd), f.Name())
 	defer func() {
-		_ = unix.Close(fd)
+		_ = xf.Close()
 	}()
-	names, err := os.NewFile(uintptr(fd), f.Name()).Readdirnames(-1)
+	names, err := xf.Readdirnames(-1)
 	if err != nil {
 		return 0, err
 	}