mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

socket: properly handle cmsg alignment

Browse Source
This commit is contained in:
Matheus
2026-06-04 13:25:03 -03:00
parent f7dd3fe17d
commit 4f3c176ad9
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/include/kernel/abi.h
+1
View File
@@ -90,6 +90,7 @@ typedef struct {
#define SOCK_STREAM 1 #define SOCK_STREAM 1
#define SOCK_DGRAM 2 #define SOCK_DGRAM 2
#define SOCK_RAW 3 #define SOCK_RAW 3
#define SOCK_SEQPACKET 5
#define MSG_CMSG_CLOEXEC 0x40000000 #define MSG_CMSG_CLOEXEC 0x40000000
#define MSG_CTRUNC 0x8 #define MSG_CTRUNC 0x8
kernel-src/include/kernel/sock.h
+10 -5
View File
@@ -263,19 +263,24 @@ static inline void sock_freemsghdr(msghdr_t *hdr) {
free(hdr->msgctrl); free(hdr->msgctrl);
} }
#define SOCK_CTRL_NEXT(c) ((sockctrl_t *)((uintptr_t)(c) + (c)->length)) #define SOCK_CTRL_ALIGN(x) (((x) + sizeof(size_t) - 1) & ~(sizeof(size_t) - 1))
#define SOCK_CTRL_LEN(x) (SOCK_CTRL_ALIGN(sizeof(sockctrl_t)) + (x))
#define SOCK_CTRL_SPACE(x) (SOCK_CTRL_ALIGN(sizeof(sockctrl_t)) + SOCK_CTRL_ALIGN(x))
#define SOCK_CTRL_DATALEN(c) ((c)->length - SOCK_CTRL_ALIGN(sizeof(sockctrl_t)))
#define SOCK_CTRL_NEXT(c) ((sockctrl_t *)((uintptr_t)(c) + SOCK_CTRL_ALIGN((c)->length)))
static inline size_t sock_countctrl(sockctrl_t *ctrl, size_t len) { static inline size_t sock_countctrl(sockctrl_t *ctrl, size_t len) {
size_t count = 0; size_t count = 0;
uintmax_t offset = 0; size_t offset = 0;
while (offset < len) { while (offset < len) {
if (ctrl->length < sizeof(sockctrl_t)) if (ctrl->length < SOCK_CTRL_LEN(0))
break; break;
offset += ctrl->length; size_t alignedlen = SOCK_CTRL_ALIGN(ctrl->length);
offset += alignedlen;
if (offset > len || offset < ctrl->length) if (offset > len || offset < alignedlen)
break; break;
++count; ++count;