commit: f3c0c2bd8c6af0bc0402d84adf5e78ec4d04e633 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Nov 14 01:46:43 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 14 01:47:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c0c2bd
sys-libs/musl: fix QEMU workaround patch This is still applied in 1.2.5-r6 but it is masked. Bug: https://bugs.gentoo.org/914256 Closes: https://bugs.gentoo.org/966043 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/musl/files/musl-getifaddrs-qemu-workaround.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-libs/musl/files/musl-getifaddrs-qemu-workaround.patch b/sys-libs/musl/files/musl-getifaddrs-qemu-workaround.patch index 0ec6237202bf..110b40995891 100644 --- a/sys-libs/musl/files/musl-getifaddrs-qemu-workaround.patch +++ b/sys-libs/musl/files/musl-getifaddrs-qemu-workaround.patch @@ -8,18 +8,18 @@ https://bugs.gentoo.org/914256 #define NLMSG_DATAEND(nlh) ((char*)(nlh)+(nlh)->nlmsg_len) #define NLMSG_NEXT(nlh) (struct nlmsghdr*)((char*)(nlh)+NETLINK_ALIGN((nlh)->nlmsg_len)) -#define NLMSG_OK(nlh,end) ((char*)(end)-(char*)(nlh) >= sizeof(struct nlmsghdr)) -+#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && \ ++#define NLMSG_OK(nlh,end) ((char*)(end)-(char*)(nlh) >= sizeof(struct nlmsghdr) && \ + (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \ -+ (nlh)->nlmsg_len <= (len)) ++ (nlh)->nlmsg_len <= ((char*)(end)-(char*)(nlh))) #define RTA_DATA(rta) ((void*)((char*)(rta)+sizeof(struct rtattr))) #define RTA_DATALEN(rta) ((rta)->rta_len-sizeof(struct rtattr)) #define RTA_DATAEND(rta) ((char*)(rta)+(rta)->rta_len) #define RTA_NEXT(rta) (struct rtattr*)((char*)(rta)+NETLINK_ALIGN((rta)->rta_len)) -#define RTA_OK(rta,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr)) -+#define RTA_OK(rta,len) ((len) >= (int)sizeof(struct rtattr) && \ ++#define RTA_OK(rta,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr) && \ + (rta)->rta_len >= sizeof(struct rtattr) && \ -+ (rta)->rta_len <= (len)) ++ (rta)->rta_len <= ((char*)(end)-(char*)(rta))) #define NLMSG_RTA(nlh,len) ((void*)((char*)(nlh)+sizeof(struct nlmsghdr)+NETLINK_ALIGN(len))) #define NLMSG_RTAOK(rta,nlh) RTA_OK(rta,NLMSG_DATAEND(nlh))
