summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-09-08 09:41:36 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-09-08 09:52:34 +0200
commitfaa5163a269b429c1d6bfd4387ced0aaff4eba69 (patch)
tree715edf950cf9da83e31548935e06f1be157c4788 /recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
parentafcde8567252191820ed07abcc241f3794b75988 (diff)
downloadmeta-qt5-faa5163a269b429c1d6bfd4387ced0aaff4eba69.tar.gz
qtwebengine: refresh the patches
* update to match https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc 5.15-glibc.meta-qt5.8 https://github.com/meta-qt5/qtwebengine/commits/b5.15 5.15-glibc.meta-qt5.8 https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based-glibc 80-based-glibc.meta-qt5.4 https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based 80-based.meta-qt5.4 * 0002-icu-use-system-library-only-targets.patch is only for chromium, so it was updated and moved to right place in SRC_URI * 0014-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch prefix was moved to src/3rdparty not src/3rdparty/chromium so that it can apply with "git am" together with other chromium patches Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
new file mode 100644
index 00000000..8db39395
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0029-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch
@@ -0,0 +1,45 @@
1From 0b04cbd5b93908bad4dfc6d829048fe90a09b868 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 10 May 2020 08:16:01 -0700
4Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner
5
6initialize msghdr in a compatible manner
7
8msghdr stuct from socket.h is not same between musl and glibc
9where musl claims to be more posix compliant where as glibc seems
10to fill whats needed for linux sizewise and chooses long enough types
11which maybe questionable, therefore constructing a structure with explicit
12constructor is not going to work correctly for musl and glibc at same time
13
14see
15https://git.musl-libc.org/cgit/musl/commit/arch/x86_64/bits/socket.h?id=7168790763cdeb794df52be6e3b39fbb021c5a64
16
17This fix initialized the struct to 0 first and then sets the struct elements
18by name, so we dont have to hard code the positions of elements when initializing
19structure
20
21Upstream-Status: Pending
22Signed-off-by: Khem Raj <raj.khem@gmail.com>
23---
24 chromium/net/socket/udp_socket_posix.cc | 8 ++++++--
25 1 file changed, 6 insertions(+), 2 deletions(-)
26
27diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc
28index 572472a6993..504fdb5d5c6 100644
29--- a/chromium/net/socket/udp_socket_posix.cc
30+++ b/chromium/net/socket/udp_socket_posix.cc
31@@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
32 for (auto& buffer : buffers)
33 msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
34 msgvec->reserve(buffers.size());
35- for (size_t j = 0; j < buffers.size(); j++)
36- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
37+ for (size_t j = 0; j < buffers.size(); j++) {
38+ struct msghdr m = {0};
39+ m.msg_iov = &msg_iov[j];
40+ m.msg_iovlen = 1;
41+ msgvec->push_back({m, 0});
42+ }
43 int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
44 SendResult send_result(0, 0, std::move(buffers));
45 if (result < 0) {