Upgrade containerd/cgroups to remove github.com/cilium/ebpf's fuzzer
The fuzzer is broken and it breaks OSS-Fuzz according to #7288. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
		
							
								
								
									
										45
									
								
								vendor/github.com/cilium/ebpf/internal/pinning.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										45
									
								
								vendor/github.com/cilium/ebpf/internal/pinning.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -4,24 +4,54 @@ import (
 | 
			
		||||
	"errors"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"os"
 | 
			
		||||
	"path/filepath"
 | 
			
		||||
	"runtime"
 | 
			
		||||
	"unsafe"
 | 
			
		||||
 | 
			
		||||
	"github.com/cilium/ebpf/internal/sys"
 | 
			
		||||
	"github.com/cilium/ebpf/internal/unix"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func Pin(currentPath, newPath string, fd *FD) error {
 | 
			
		||||
func Pin(currentPath, newPath string, fd *sys.FD) error {
 | 
			
		||||
	const bpfFSType = 0xcafe4a11
 | 
			
		||||
 | 
			
		||||
	if newPath == "" {
 | 
			
		||||
		return errors.New("given pinning path cannot be empty")
 | 
			
		||||
	}
 | 
			
		||||
	if currentPath == newPath {
 | 
			
		||||
		return nil
 | 
			
		||||
	}
 | 
			
		||||
	if currentPath == "" {
 | 
			
		||||
		return BPFObjPin(newPath, fd)
 | 
			
		||||
 | 
			
		||||
	var statfs unix.Statfs_t
 | 
			
		||||
	if err := unix.Statfs(filepath.Dir(newPath), &statfs); err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	var err error
 | 
			
		||||
 | 
			
		||||
	fsType := int64(statfs.Type)
 | 
			
		||||
	if unsafe.Sizeof(statfs.Type) == 4 {
 | 
			
		||||
		// We're on a 32 bit arch, where statfs.Type is int32. bpfFSType is a
 | 
			
		||||
		// negative number when interpreted as int32 so we need to cast via
 | 
			
		||||
		// uint32 to avoid sign extension.
 | 
			
		||||
		fsType = int64(uint32(statfs.Type))
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if fsType != bpfFSType {
 | 
			
		||||
		return fmt.Errorf("%s is not on a bpf filesystem", newPath)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	defer runtime.KeepAlive(fd)
 | 
			
		||||
 | 
			
		||||
	if currentPath == "" {
 | 
			
		||||
		return sys.ObjPin(&sys.ObjPinAttr{
 | 
			
		||||
			Pathname: sys.NewStringPointer(newPath),
 | 
			
		||||
			BpfFd:    fd.Uint(),
 | 
			
		||||
		})
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Renameat2 is used instead of os.Rename to disallow the new path replacing
 | 
			
		||||
	// an existing path.
 | 
			
		||||
	if err = unix.Renameat2(unix.AT_FDCWD, currentPath, unix.AT_FDCWD, newPath, unix.RENAME_NOREPLACE); err == nil {
 | 
			
		||||
	err := unix.Renameat2(unix.AT_FDCWD, currentPath, unix.AT_FDCWD, newPath, unix.RENAME_NOREPLACE)
 | 
			
		||||
	if err == nil {
 | 
			
		||||
		// Object is now moved to the new pinning path.
 | 
			
		||||
		return nil
 | 
			
		||||
	}
 | 
			
		||||
@@ -29,7 +59,10 @@ func Pin(currentPath, newPath string, fd *FD) error {
 | 
			
		||||
		return fmt.Errorf("unable to move pinned object to new path %v: %w", newPath, err)
 | 
			
		||||
	}
 | 
			
		||||
	// Internal state not in sync with the file system so let's fix it.
 | 
			
		||||
	return BPFObjPin(newPath, fd)
 | 
			
		||||
	return sys.ObjPin(&sys.ObjPinAttr{
 | 
			
		||||
		Pathname: sys.NewStringPointer(newPath),
 | 
			
		||||
		BpfFd:    fd.Uint(),
 | 
			
		||||
	})
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func Unpin(pinnedPath string) error {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user