Skip to content

Fix socket_sendmsg() sending wrong fd for Socket objects in SCM_RIGHTS #22338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iliaal wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+79 −2
Open

Fix socket_sendmsg() sending wrong fd for Socket objects in SCM_RIGHTS #22338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/sockets/conversions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,7 @@ static void from_zval_write_fd_array_aux(zval *elem, unsigned i, void **args, se
return;
}

iarr[i] = sock->bsd_socket;
iarr[i - 1] = sock->bsd_socket;
return;
}

Expand Down
2 changes: 1 addition & 1 deletion ext/sockets/tests/socket_cmsg_rights.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ if ($data["control"]) {
if ($control["level"] == SOL_SOCKET &&
$control["type"] == SCM_RIGHTS) {
foreach ($control["data"] as $resource) {
if (!is_resource($resource)) {
if (!is_resource($resource) && !($resource instanceof Socket)) {
echo "FAIL RES\n";
var_dump($data);
exit;
Expand Down
77 changes: 77 additions & 0 deletions ext/sockets/tests/socket_sendmsg_scm_rights_object.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
--TEST--
socket_sendmsg(): SCM_RIGHTS transfers Socket objects with the correct fds
--EXTENSIONS--
sockets
--SKIPIF--
<?php
if (strtolower(substr(PHP_OS, 0, 3)) == 'win') {
die('skip not for Microsoft Windows');
}
if (strtolower(substr(PHP_OS, 0, 3)) == 'aix') {
die('skip not for AIX');
}
if (!defined('SCM_RIGHTS')) {
die('skip SCM_RIGHTS not available');
}
?>
--FILE--
<?php
$dir = sys_get_temp_dir();
$rpath = $dir . "/socket_sendmsg_scm_rights_object_r.sock";
$ppath1 = $dir . "/socket_sendmsg_scm_rights_object_p1.sock";
$ppath2 = $dir . "/socket_sendmsg_scm_rights_object_p2.sock";
@unlink($rpath);
@unlink($ppath1);
@unlink($ppath2);

$recv = socket_create(AF_UNIX, SOCK_DGRAM, 0);
socket_bind($recv, $rpath);

$send = socket_create(AF_UNIX, SOCK_DGRAM, 0);
socket_connect($send, $rpath);

// Two Socket objects in a single SCM_RIGHTS message, each bound to a known
// path so the received fds can be identified and ordered via getsockname().
$payload1 = socket_create(AF_UNIX, SOCK_DGRAM, 0);
socket_bind($payload1, $ppath1);
$payload2 = socket_create(AF_UNIX, SOCK_DGRAM, 0);
socket_bind($payload2, $ppath2);

socket_sendmsg($send, [
'iov' => ['x'],
'control' => [[
'level' => SOL_SOCKET,
'type' => SCM_RIGHTS,
'data' => [$payload1, $payload2],
]],
], 0);

$data = [
'name' => [],
'buffer_size' => 64,
'controllen' => socket_cmsg_space(SOL_SOCKET, SCM_RIGHTS, 2),
];
socket_recvmsg($recv, $data, 0);

$got = $data['control'][0]['data'];
var_dump(count($got));
var_dump($got[0] instanceof Socket);
var_dump($got[1] instanceof Socket);
socket_getsockname($got[0], $addr0);
socket_getsockname($got[1], $addr1);
var_dump($addr0 === $ppath1);
var_dump($addr1 === $ppath2);
?>
--CLEAN--
<?php
$dir = sys_get_temp_dir();
@unlink($dir . "/socket_sendmsg_scm_rights_object_r.sock");
@unlink($dir . "/socket_sendmsg_scm_rights_object_p1.sock");
@unlink($dir . "/socket_sendmsg_scm_rights_object_p2.sock");
?>
--EXPECT--
int(2)
bool(true)
bool(true)
bool(true)
bool(true)
Loading