Skip to content
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

Cumulated fixes #1239

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Cumulated fixes #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c659bd3
sysdeps/managarm: support `DRM_IOCTL_MODE_CURSOR2`
no92 Feb 5, 2025
b71d2cc
sysdeps/managarm: correctly pass through `SO_{PEER,PASS}CRED`
no92 Feb 5, 2025
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
39 changes: 39 additions & 0 deletions sysdeps/managarm/generic/drm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,45 @@ int ioctl_drm(int fd, unsigned long request, void *arg, int *result, HelHandle h
return 0;
}
}
case DRM_IOCTL_MODE_CURSOR2: {
auto param = reinterpret_cast<drm_mode_cursor2 *>(arg);

managarm::fs::GenericIoctlRequest<MemoryAllocator> req(getSysdepsAllocator());
req.set_command(request);

req.set_drm_flags(param->flags);
req.set_drm_crtc_id(param->crtc_id);
req.set_drm_x(param->x);
req.set_drm_y(param->y);
req.set_drm_width(param->width);
req.set_drm_height(param->height);
req.set_drm_handle(param->handle);

auto [offer, send_ioctl_req, send_req, recv_resp] = exchangeMsgsSync(
handle,
helix_ng::offer(
helix_ng::sendBragiHeadOnly(ioctl_req, getSysdepsAllocator()),
helix_ng::sendBragiHeadOnly(req, getSysdepsAllocator()),
helix_ng::recvInline()
)
);
HEL_CHECK(offer.error());
HEL_CHECK(send_ioctl_req.error());
HEL_CHECK(send_req.error());
HEL_CHECK(recv_resp.error());

managarm::fs::GenericIoctlReply<MemoryAllocator> resp(getSysdepsAllocator());
resp.ParseFromArray(recv_resp.data(), recv_resp.length());

if (resp.error() == managarm::fs::Errors::NO_BACKING_DEVICE) {
return ENXIO;
} else if (resp.error() == managarm::fs::Errors::ILLEGAL_ARGUMENT) {
return EINVAL;
} else {
*result = resp.result();
return 0;
}
}
case DRM_IOCTL_MODE_DESTROY_DUMB: {
auto param = reinterpret_cast<drm_mode_destroy_dumb *>(arg);

Expand Down
80 changes: 11 additions & 69 deletions sysdeps/managarm/generic/socket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,9 @@ int sys_peername(

namespace {

std::array<std::pair<int, int>, 2> getsockopt_passthrough = {{
std::array<std::pair<int, int>, 3> getsockopt_passthrough = {{
{SOL_SOCKET, SO_PROTOCOL},
{SOL_SOCKET, SO_PEERCRED},
{SOL_NETLINK, NETLINK_LIST_MEMBERSHIPS},
}};

Expand All @@ -265,39 +266,7 @@ int
sys_getsockopt(int fd, int layer, int number, void *__restrict buffer, socklen_t *__restrict size) {
SignalGuard sguard;

if (layer == SOL_SOCKET && number == SO_PEERCRED) {
if (*size != sizeof(struct ucred))
return EINVAL;

auto handle = getHandleForFd(fd);
if (!handle)
return EBADF;

managarm::fs::CntRequest<MemoryAllocator> req(getSysdepsAllocator());
req.set_req_type(managarm::fs::CntReqType::PT_GET_OPTION);
req.set_command(SO_PEERCRED);

auto [offer, send_req, recv_resp] = exchangeMsgsSync(
handle,
helix_ng::offer(
helix_ng::sendBragiHeadOnly(req, getSysdepsAllocator()), helix_ng::recvInline()
)
);
HEL_CHECK(offer.error());
HEL_CHECK(send_req.error());
HEL_CHECK(recv_resp.error());

managarm::fs::SvrResponse<MemoryAllocator> resp(getSysdepsAllocator());
resp.ParseFromArray(recv_resp.data(), recv_resp.length());
__ensure(resp.error() == managarm::fs::Errors::SUCCESS);

struct ucred creds;
creds.pid = resp.pid();
creds.uid = resp.uid();
creds.gid = resp.gid();
memcpy(buffer, &creds, sizeof(struct ucred));
return 0;
} else if (layer == SOL_SOCKET && number == SO_SNDBUF) {
if (layer == SOL_SOCKET && number == SO_SNDBUF) {
mlibc::infoLogger(
) << "\e[31mmlibc: getsockopt() call with SOL_SOCKET and SO_SNDBUF is unimplemented\e[39m"
<< frg::endlog;
Expand Down Expand Up @@ -416,11 +385,12 @@ std::array<std::pair<int, int>, 6> setsockopt_readonly = {{
{SOL_IP, SO_PEERSEC},
}};

std::array<std::pair<int, int>, 9> setsockopt_passthrough = {{
std::array<std::pair<int, int>, 10> setsockopt_passthrough = {{
{SOL_PACKET, PACKET_AUXDATA},
{SOL_SOCKET, SO_LOCK_FILTER},
{SOL_SOCKET, SO_BINDTODEVICE},
{SOL_SOCKET, SO_TIMESTAMP},
{SOL_SOCKET, SO_PASSCRED},
{SOL_IP, IP_PKTINFO},
{SOL_IP, IP_RECVTTL},
{SOL_IP, IP_RETOPTS},
Expand All @@ -437,40 +407,12 @@ std::array<std::pair<int, int>, 2> setsockopt_passthrough_noopt = {{
int sys_setsockopt(int fd, int layer, int number, const void *buffer, socklen_t size) {
SignalGuard sguard;

if (layer == SOL_SOCKET && number == SO_PASSCRED) {
int value;
__ensure(size == sizeof(int));
memcpy(&value, buffer, sizeof(int));

auto handle = getHandleForFd(fd);
if (!handle)
return EBADF;

managarm::fs::CntRequest<MemoryAllocator> req(getSysdepsAllocator());
req.set_req_type(managarm::fs::CntReqType::PT_SET_OPTION);
req.set_command(SO_PASSCRED);
req.set_value(value);

auto [offer, send_req, recv_resp] = exchangeMsgsSync(
handle,
helix_ng::offer(
helix_ng::sendBragiHeadOnly(req, getSysdepsAllocator()), helix_ng::recvInline()
)
);
HEL_CHECK(offer.error());
HEL_CHECK(send_req.error());
HEL_CHECK(recv_resp.error());

managarm::fs::SvrResponse<MemoryAllocator> resp(getSysdepsAllocator());
resp.ParseFromArray(recv_resp.data(), recv_resp.length());
__ensure(resp.error() == managarm::fs::Errors::SUCCESS);
return 0;
} else if (std::find(
setsockopt_passthrough.begin(),
setsockopt_passthrough.end(),
std::pair<int, int>{layer, number}
)
!= setsockopt_passthrough.end()) {
if (std::find(
setsockopt_passthrough.begin(),
setsockopt_passthrough.end(),
std::pair<int, int>{layer, number}
)
!= setsockopt_passthrough.end()) {
auto handle = getHandleForFd(fd);
if (!handle)
return EBADF;
Expand Down