Page MenuHomeFreeBSD
Differential D31038

rtld/tests: Avoid function name conflict with libc opendir()
ClosedPublic
Actions

Authored by arichardson on Jul 5 2021, 8:40 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 16, 10:27 PM
Unknown Object (File)
Mon, Feb 24, 9:57 AM
Unknown Object (File)
Sun, Feb 23, 7:14 PM
Unknown Object (File)
Thu, Feb 20, 2:09 PM
Unknown Object (File)
Feb 13 2025, 9:05 PM
Unknown Object (File)
Feb 12 2025, 9:44 PM
Unknown Object (File)
Jan 29 2025, 3:05 AM
Unknown Object (File)
Jan 29 2025, 2:54 AM
View All 61 Files
Subscribers
bdragon
imp

Details

Reviewers
oshogbo
kib
markj
Commits
rGe34c713b0e66: rtld/tests: Avoid function name conflict with libc opendir()
Summary

This prevents these tests from being compiled with ASAN since the asan
interceptors also define opendir() but matching the libc function.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 40285
Build 37174: arc lint + arc unit

Event Timeline

arichardson created this revision.Jul 5 2021, 8:40 AM
Herald added subscribers: bdragon, imp. · View Herald TranscriptJul 5 2021, 8:40 AM
arichardson requested review of this revision.Jul 5 2021, 8:40 AM
Harbormaster completed remote builds in B40285: Diff 91758.Jul 5 2021, 8:40 AM
kib accepted this revision.Jul 5 2021, 8:59 AM
This revision is now accepted and ready to land.Jul 5 2021, 8:59 AM
oshogbo accepted this revision.Jul 5 2021, 9:33 AM

We have fdopendir in libc I wonder if this won't be confusing. Maybe we should rename this to something like rtld_opendir.
But whatever name your choose this LGTM.

markj accepted this revision.Jul 5 2021, 11:46 AM
Closed by commit rGe34c713b0e66: rtld/tests: Avoid function name conflict with libc opendir() (authored by arichardson). · Explain WhyJul 6 2021, 10:07 AM
This revision was automatically updated to reflect the committed changes.
arichardson added a commit: rGe34c713b0e66: rtld/tests: Avoid function name conflict with libc opendir().

Revision Contents
Changeset List

PathSize
libexec/
rtld-elf/
tests/
2 lines
2 lines
4 lines
2 lines

Diff 91758

View Options

libexec/rtld-elf/tests/common.h

  • This file was added.
--- internal/ssh/ssh.go.orig 1979-11-29 23:00:00 UTC
+++ internal/ssh/ssh.go
@@ -6,7 +6,6 @@ import (
import (
"context"
- "fmt"
"io"
"net"
"os"
@@ -54,28 +53,6 @@ func handleServerConn(keyID string, chans <-chan ssh.N
for req := range in {
payload := cleanCommand(string(req.Payload))
switch req.Type {
- case "env":
- var env struct {
- Name string
- Value string
- }
- if err := ssh.Unmarshal(req.Payload, &env); err != nil {
- log.Warn("SSH: Invalid env payload %q: %v", req.Payload, err)
- continue
- }
- // Sometimes the client could send malformed command (i.e. missing "="),
- // see https://discuss.gogs.io/t/ssh/3106.
- if env.Name == "" || env.Value == "" {
- log.Warn("SSH: Invalid env arguments: %+v", env)
- continue
- }
-
- _, stderr, err := com.ExecCmd("env", fmt.Sprintf("%s=%s", env.Name, env.Value))
- if err != nil {
- log.Error("env: %v - %s", err, stderr)
- return
- }
-
case "exec":
cmdName := strings.TrimLeft(payload, "'()")
log.Trace("SSH: Payload: %v", cmdName)
View Options

libexec/rtld-elf/tests/common.c

  • This file was added.
--- internal/ssh/ssh.go.orig 1979-11-29 23:00:00 UTC
+++ internal/ssh/ssh.go
@@ -6,7 +6,6 @@ import (
import (
"context"
- "fmt"
"io"
"net"
"os"
@@ -54,28 +53,6 @@ func handleServerConn(keyID string, chans <-chan ssh.N
for req := range in {
payload := cleanCommand(string(req.Payload))
switch req.Type {
- case "env":
- var env struct {
- Name string
- Value string
- }
- if err := ssh.Unmarshal(req.Payload, &env); err != nil {
- log.Warn("SSH: Invalid env payload %q: %v", req.Payload, err)
- continue
- }
- // Sometimes the client could send malformed command (i.e. missing "="),
- // see https://discuss.gogs.io/t/ssh/3106.
- if env.Name == "" || env.Value == "" {
- log.Warn("SSH: Invalid env arguments: %+v", env)
- continue
- }
-
- _, stderr, err := com.ExecCmd("env", fmt.Sprintf("%s=%s", env.Name, env.Value))
- if err != nil {
- log.Error("env: %v - %s", err, stderr)
- return
- }
-
case "exec":
cmdName := strings.TrimLeft(payload, "'()")
log.Trace("SSH: Payload: %v", cmdName)
View Options

libexec/rtld-elf/tests/ld_library_pathfds.c

  • This file was added.
--- internal/ssh/ssh.go.orig 1979-11-29 23:00:00 UTC
+++ internal/ssh/ssh.go
@@ -6,7 +6,6 @@ import (
import (
"context"
- "fmt"
"io"
"net"
"os"
@@ -54,28 +53,6 @@ func handleServerConn(keyID string, chans <-chan ssh.N
for req := range in {
payload := cleanCommand(string(req.Payload))
switch req.Type {
- case "env":
- var env struct {
- Name string
- Value string
- }
- if err := ssh.Unmarshal(req.Payload, &env); err != nil {
- log.Warn("SSH: Invalid env payload %q: %v", req.Payload, err)
- continue
- }
- // Sometimes the client could send malformed command (i.e. missing "="),
- // see https://discuss.gogs.io/t/ssh/3106.
- if env.Name == "" || env.Value == "" {
- log.Warn("SSH: Invalid env arguments: %+v", env)
- continue
- }
-
- _, stderr, err := com.ExecCmd("env", fmt.Sprintf("%s=%s", env.Name, env.Value))
- if err != nil {
- log.Error("env: %v - %s", err, stderr)
- return
- }
-
case "exec":
cmdName := strings.TrimLeft(payload, "'()")
log.Trace("SSH: Payload: %v", cmdName)
View Options

libexec/rtld-elf/tests/ld_preload_fds.c

  • This file was added.
--- internal/ssh/ssh.go.orig 1979-11-29 23:00:00 UTC
+++ internal/ssh/ssh.go
@@ -6,7 +6,6 @@ import (
import (
"context"
- "fmt"
"io"
"net"
"os"
@@ -54,28 +53,6 @@ func handleServerConn(keyID string, chans <-chan ssh.N
for req := range in {
payload := cleanCommand(string(req.Payload))
switch req.Type {
- case "env":
- var env struct {
- Name string
- Value string
- }
- if err := ssh.Unmarshal(req.Payload, &env); err != nil {
- log.Warn("SSH: Invalid env payload %q: %v", req.Payload, err)
- continue
- }
- // Sometimes the client could send malformed command (i.e. missing "="),
- // see https://discuss.gogs.io/t/ssh/3106.
- if env.Name == "" || env.Value == "" {
- log.Warn("SSH: Invalid env arguments: %+v", env)
- continue
- }
-
- _, stderr, err := com.ExecCmd("env", fmt.Sprintf("%s=%s", env.Name, env.Value))
- if err != nil {
- log.Error("env: %v - %s", err, stderr)
- return
- }
-
case "exec":
cmdName := strings.TrimLeft(payload, "'()")
log.Trace("SSH: Payload: %v", cmdName)