diff options
| -rw-r--r-- | benchmarks/workloads/ruby/Gemfile.lock | 12 | ||||
| -rw-r--r-- | pkg/sentry/fdimport/fdimport.go | 5 | ||||
| -rw-r--r-- | test/syscalls/linux/raw_socket_hdrincl.cc | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/benchmarks/workloads/ruby/Gemfile.lock b/benchmarks/workloads/ruby/Gemfile.lock index ea9f0ea85..82bfc0c79 100644 --- a/benchmarks/workloads/ruby/Gemfile.lock +++ b/benchmarks/workloads/ruby/Gemfile.lock @@ -6,22 +6,23 @@ GEM builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) nokogiri (~> 1.4) - activesupport (5.2.3) + activesupport (6.0.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) bcrypt (3.1.13) builder (3.2.4) cassandra-driver (3.2.3) ione (~> 1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) ffi (1.12.2) - i18n (1.6.0) + i18n (1.8.5) concurrent-ruby (~> 1.0) ione (1.2.4) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.1) mustermann (1.0.3) nokogiri (1.10.8) mini_portile2 (~> 2.4.0) @@ -49,8 +50,9 @@ GEM thread_safe (0.3.6) tilt (2.0.9) ttfunk (1.5.1) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) + zeitwerk (2.4.0) PLATFORMS ruby diff --git a/pkg/sentry/fdimport/fdimport.go b/pkg/sentry/fdimport/fdimport.go index a4199f9e9..b8686adb4 100644 --- a/pkg/sentry/fdimport/fdimport.go +++ b/pkg/sentry/fdimport/fdimport.go @@ -15,6 +15,8 @@ package fdimport import ( + "fmt" + "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/sentry/fs" "gvisor.dev/gvisor/pkg/sentry/fs/host" @@ -84,6 +86,9 @@ func importFS(ctx context.Context, fdTable *kernel.FDTable, console bool, fds [] func importVFS2(ctx context.Context, fdTable *kernel.FDTable, console bool, stdioFDs []int) (*hostvfs2.TTYFileDescription, error) { k := kernel.KernelFromContext(ctx) + if k == nil { + return nil, fmt.Errorf("cannot find kernel from context") + } var ttyFile *vfs.FileDescription for appFD, hostFD := range stdioFDs { diff --git a/test/syscalls/linux/raw_socket_hdrincl.cc b/test/syscalls/linux/raw_socket_hdrincl.cc index 97f0467aa..2f25aceb2 100644 --- a/test/syscalls/linux/raw_socket_hdrincl.cc +++ b/test/syscalls/linux/raw_socket_hdrincl.cc @@ -178,7 +178,7 @@ TEST_F(RawHDRINCL, ConnectToLoopback) { } TEST_F(RawHDRINCL, SendWithoutConnectSucceeds) { - // FIXME(github.dev/issue/3159): Test currently flaky. + // FIXME(gvisor.dev/issue/3159): Test currently flaky. SKIP_IF(true); struct iphdr hdr = LoopbackHeader(); @@ -284,7 +284,7 @@ TEST_F(RawHDRINCL, SendAndReceive) { // Send and receive a packet where the sendto address is not the same as the // provided destination. TEST_F(RawHDRINCL, SendAndReceiveDifferentAddress) { - // FIXME(github.dev/issue/3160): Test currently flaky. + // FIXME(gvisor.dev/issue/3160): Test currently flaky. SKIP_IF(true); int port = 40000; |