All of lore.kernel.org
 help / color / mirror / Atom feed
From: "akuster" <akuster808@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [gatesgarth 08/31] multipath-tools: fix error handling for udev_monitor_set_receive_buffer_size
Date: Sun, 17 Jan 2021 09:36:13 -0800	[thread overview]
Message-ID: <d6d0ef5cae7581e55b9c53390a26ae5f0b46ed74.1610904793.git.akuster808@gmail.com> (raw)
In-Reply-To: <cover.1610904792.git.akuster808@gmail.com>

From: Joe Slater <joe.slater@windriver.com>

Since systemd v246.5[1], udev_monitor_set_receive_buffer_size() will
return 0 or 1 if successful. We only need to check a negative value for
the failure.

[1] https://github.com/systemd/systemd-stable/commit/4dcae666889ae9469e4406c0bcaffadbc01c4f66
    https://github.com/systemd/systemd-stable/commit/fe9b92e566f837665cc06c82374e4e42f9295c99
    https://github.com/systemd/systemd-stable/commit/5dd4cc4b10daea5d2ba969425ba02d2098dd06a4

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 60a95ba16ec29d9cb8be32436bb0f96b2a5106aa)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...ent.c-fix-error-handling-for-udev_mo.patch | 39 +++++++++++++++++++
 .../multipath-tools/multipath-tools_0.8.4.bb  |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch

diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch
new file mode 100644
index 0000000000..d261b13d91
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch
@@ -0,0 +1,39 @@
+From 8579d8a35886f91974e0ac4dbdf2edb7dac06d52 Mon Sep 17 00:00:00 2001
+From: Joe Slater <joe.slater@windriver.com>
+Date: Fri, 18 Dec 2020 11:17:50 +0800
+Subject: [PATCH] libmultipath/uevent.c: fix error handling for
+ udev_monitor_set_receive_buffer_size
+
+Since systemd v246.5[1], udev_monitor_set_receive_buffer_size() will
+return 0 or 1 if successful. We only need to check a negative value for
+the failure.
+
+[1] https://github.com/systemd/systemd-stable/commit/4dcae666889ae9469e4406c0bcaffadbc01c4f66
+    https://github.com/systemd/systemd-stable/commit/fe9b92e566f837665cc06c82374e4e42f9295c99
+    https://github.com/systemd/systemd-stable/commit/5dd4cc4b10daea5d2ba969425ba02d2098dd06a4
+
+Upstream-Status: Pending
+
+Signed-off-by: Joe Slater <joe.slater@windriver.com>
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ libmultipath/uevent.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libmultipath/uevent.c b/libmultipath/uevent.c
+index d38e8a7f..4b298052 100644
+--- a/libmultipath/uevent.c
++++ b/libmultipath/uevent.c
+@@ -810,7 +810,8 @@ int uevent_listen(struct udev *udev)
+ 	}
+ 	pthread_cleanup_push(monitor_cleanup, monitor);
+ #ifdef LIBUDEV_API_RECVBUF
+-	if (udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024))
++	err = udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024);
++	if (err < 0)
+ 		condlog(2, "failed to increase buffer size");
+ #endif
+ 	fd = udev_monitor_get_fd(monitor);
+-- 
+2.17.1
+
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
index 331c0cd018..186f78b8f2 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
@@ -47,6 +47,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \
            file://0001-fix-bug-of-do_compile-and-do_install.patch \
            file://0001-add-explicit-dependency-on-libraries.patch \
            file://0001-fix-boolean-value-with-json-c-0.14.patch \
+           file://0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch \
            "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-- 
2.17.1


  parent reply	other threads:[~2021-01-17 17:36 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-17 17:36 [gatesgarth 00/31] Patch Review akuster
2021-01-17 17:36 ` [gatesgarth 01/31] mcpp: Normalize the patch format of CVE akuster
2021-01-17 17:36 ` [gatesgarth 02/31] zabbix: CVE-2020-15803 Security Advisory akuster
2021-01-17 17:36 ` [gatesgarth 03/31] samba: CVE-2020-14318 " akuster
2021-01-17 17:36 ` [gatesgarth 04/31] samba: CVE-2020-14383 " akuster
2021-01-17 17:36 ` [gatesgarth 05/31] php: CVE-2020-7070 akuster
2021-01-17 17:36 ` [gatesgarth 06/31] php: CVE-2020-7069 akuster
2021-01-17 17:36 ` [gatesgarth 07/31] nodejs: 12.19.0 -> 12.19.1 akuster
2021-01-17 17:36 ` akuster [this message]
2021-01-17 17:36 ` [gatesgarth 09/31] ebtables: do not install /etc/ethertypes akuster
2021-01-17 17:36 ` [gatesgarth 10/31] lockfile-progs: use DEBIAN_MIRROR in SRC_URI akuster
2021-01-17 17:36 ` [gatesgarth 11/31] python3-aiohttp: added missing RDEPENDs akuster
2021-01-17 17:36 ` [gatesgarth 12/31] liboop: use upstream SRC_URI akuster
2021-01-17 17:36 ` [gatesgarth 13/31] fbset: use DEBIAN_MIRROR in SRC_URI akuster
2021-01-17 17:36 ` [gatesgarth 14/31] openct: use upstream SRC_URI akuster
2021-01-17 17:36 ` [gatesgarth 15/31] colord: fix installed-vs-shipped error akuster
2021-01-17 17:36 ` [gatesgarth 16/31] pidgin-sipe: Do not add native libdir to pkgconfig search path akuster
2021-01-17 17:36 ` [gatesgarth 17/31] sdbus-c++-libsystemd: Fix reallocarray check in meson akuster
2021-01-17 17:36 ` [gatesgarth 18/31] networkmanager: Fix reallocarray check in meson and configure akuster
2021-01-17 17:36 ` [gatesgarth 19/31] spdlog: Fix recipe so other recipes can use spdlog with external fmt akuster
2021-01-17 17:36 ` [gatesgarth 20/31] nanopb: move to dynamic-layers akuster
2021-01-17 17:36 ` [gatesgarth 21/31] postgresql: Use /dev/urandom when openssl is not used akuster
2021-01-17 17:36 ` [gatesgarth 22/31] tclap: align version to tag v1.2.2 akuster
2021-01-17 17:36 ` [gatesgarth 23/31] tclap: fix branch akuster
2021-01-17 17:36 ` [gatesgarth 24/31] lmbench: Fix setting LDLIBS failure akuster
2021-01-17 17:36 ` [gatesgarth 25/31] wireshark: Several securtiy fixes akuster
2021-01-17 17:36 ` [gatesgarth 26/31] nodejs: 12.19.1 -> 12.20.1 akuster
2021-01-17 17:36 ` [gatesgarth 27/31] libsdl2-mixer: Fix ogg/vorbis support in libsdl2-mixer akuster
2021-01-17 17:36 ` [gatesgarth 28/31] libsdl2-mixer: set --disable-music-ogg-shared to link statically akuster
2021-01-17 17:36 ` [gatesgarth 29/31] gssdp: Upgrade to 1.2.2 -> 1.2.3 akuster
2021-01-17 17:36 ` [gatesgarth 30/31] gupnp: Upgrade to 1.2.2 -> 1.2.4 akuster
2021-01-17 17:36 ` [gatesgarth 31/31] fuse: set CVE_PRODUCT to "fuse_project:fuse" akuster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d6d0ef5cae7581e55b9c53390a26ae5f0b46ed74.1610904793.git.akuster808@gmail.com \
    --to=akuster808@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.