qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 00:40:12 -07:00
Code Releases Activity

syscall: enforce minimum buffer size to call ReadDirent

Browse Source 
freebsd and netbsd require a minimum buffer size of 1K.

Note this doesn't quite fix freebsd, it has other bugs,
I'll file a separate issue.

Fixes #31403

Change-Id: I9d7e78f6d30859b34715afadc4b8bd3b1ecc606b
Reviewed-on: https://go-review.googlesource.com/c/go/+/171757
Run-TryBot: Keith Randall <khr@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Keith Randall 2019-04-11 09:09:39 -07:00 committed by Keith Randall
parent 3cb92fcba7
commit 770f2a17d2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/syscall/dirent_bsd_test.go
View File

@ -12,6 +12,7 @@ import (
"io/ioutil"
"os"
"path/filepath"
"runtime"
"sort"
"strconv"
"strings"
@ -79,6 +80,14 @@ func TestDirent(t *testing.T) {
func TestDirentRepeat(t *testing.T) {
const N = 100
// Note: the size of the buffer is small enough that the loop
// below will need to execute multiple times. See issue #31368.
size := N * unsafe.Offsetof(syscall.Dirent{}.Name) / 4
if runtime.GOOS == "freebsd" || runtime.GOOS == "netbsd" {
if size < 1024 {
size = 1024 // DIRBLKSIZ, see issue 31403.
}
}
// Make a directory containing N files
d, err := ioutil.TempDir("", "direntRepeat-test")
@ -106,9 +115,7 @@ func TestDirentRepeat(t *testing.T) {
defer syscall.Close(fd)
var files2 []string
for {
// Note: the buf is small enough that this loop will need to
// execute multiple times. See issue #31368.
buf := make([]byte, N*unsafe.Offsetof(syscall.Dirent{}.Name)/4)
buf := make([]byte, size)
n, err := syscall.ReadDirent(fd, buf)
if err != nil {
t.Fatalf("syscall.readdir: %v", err)