* [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6
@ 2017-12-12 19:51 Baruch Siach
2017-12-12 19:51 ` [Buildroot] [PATCH 2/2] dhcp: add upstream security fix Baruch Siach
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Baruch Siach @ 2017-12-12 19:51 UTC (permalink / raw)
To: buildroot
Renumber the patch.
Add license hash.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
...{0002-bind-cross-compile.patch => 0001-bind-cross-compile.patch} | 0
package/dhcp/dhcp.hash | 6 ++++--
package/dhcp/dhcp.mk | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
rename package/dhcp/{0002-bind-cross-compile.patch => 0001-bind-cross-compile.patch} (100%)
diff --git a/package/dhcp/0002-bind-cross-compile.patch b/package/dhcp/0001-bind-cross-compile.patch
similarity index 100%
rename from package/dhcp/0002-bind-cross-compile.patch
rename to package/dhcp/0001-bind-cross-compile.patch
diff --git a/package/dhcp/dhcp.hash b/package/dhcp/dhcp.hash
index 7898aa45d3b7..ce5f995a55bb 100644
--- a/package/dhcp/dhcp.hash
+++ b/package/dhcp/dhcp.hash
@@ -1,2 +1,4 @@
-# Verified from https://ftp.isc.org/isc/dhcp/4.3.5/dhcp-4.3.5.tar.gz.sha256.asc
-sha256 eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954 dhcp-4.3.5.tar.gz
+# Verified from https://ftp.isc.org/isc/dhcp/4.3.6/dhcp-4.3.6.tar.gz.sha256.asc
+sha256 a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b dhcp-4.3.6.tar.gz
+# Locally calculated
+sha256 dd7ae2201c0c11c3c1e2510d731c67b2f4bc8ba735707d7348ddd65f7b598562 LICENSE
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 45cae087aae0..4e1b24b7001c 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DHCP_VERSION = 4.3.5
+DHCP_VERSION = 4.3.6
DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
DHCP_INSTALL_STAGING = YES
DHCP_LICENSE = ISC
--
2.15.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 2/2] dhcp: add upstream security fix
2017-12-12 19:51 [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6 Baruch Siach
@ 2017-12-12 19:51 ` Baruch Siach
2017-12-27 11:57 ` Peter Korsgaard
2017-12-30 22:40 ` Peter Korsgaard
2017-12-13 13:20 ` [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6 Thomas Petazzoni
` (2 subsequent siblings)
3 siblings, 2 replies; 7+ messages in thread
From: Baruch Siach @ 2017-12-12 19:51 UTC (permalink / raw)
To: buildroot
Fixes socket leak that might cause denial of serivce.
https://bugzilla.redhat.com/show_bug.cgi?id=1523547
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
...3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch | 51 ++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 package/dhcp/0002-v4_3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch
diff --git a/package/dhcp/0002-v4_3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch b/package/dhcp/0002-v4_3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch
new file mode 100644
index 000000000000..df294651fb81
--- /dev/null
+++ b/package/dhcp/0002-v4_3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch
@@ -0,0 +1,51 @@
+From 5097bc0559f592683faac1f67bf350e1bddf6ed4 Mon Sep 17 00:00:00 2001
+From: Thomas Markwalder <tmark@isc.org>
+Date: Thu, 7 Dec 2017 11:39:30 -0500
+Subject: [PATCH] [v4_3] Plugs a socket descriptor leak in OMAPI
+
+ Merges in rt46767.
+
+[baruch: drop RELNOTES hunk]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: upstream commit 5097bc0559f
+
+ omapip/buffer.c | 9 +++++++++
+ omapip/message.c | 2 +-
+
+diff --git a/omapip/buffer.c b/omapip/buffer.c
+index f7fdc3250e82..809034d1317b 100644
+--- a/omapip/buffer.c
++++ b/omapip/buffer.c
+@@ -566,6 +566,15 @@ isc_result_t omapi_connection_writer (omapi_object_t *h)
+ omapi_buffer_dereference (&buffer, MDL);
+ }
+ }
++
++ /* If we had data left to write when we're told to disconnect,
++ * we need recall disconnect, now that we're done writing.
++ * See rt46767. */
++ if (c->out_bytes == 0 && c->state == omapi_connection_disconnecting) {
++ omapi_disconnect (h, 1);
++ return ISC_R_SHUTTINGDOWN;
++ }
++
+ return ISC_R_SUCCESS;
+ }
+
+diff --git a/omapip/message.c b/omapip/message.c
+index 59ccdc2c05cf..21bcfc3822e7 100644
+--- a/omapip/message.c
++++ b/omapip/message.c
+@@ -339,7 +339,7 @@ isc_result_t omapi_message_unregister (omapi_object_t *mo)
+ }
+
+ #ifdef DEBUG_PROTOCOL
+-static const char *omapi_message_op_name(int op) {
++const char *omapi_message_op_name(int op) {
+ switch (op) {
+ case OMAPI_OP_OPEN: return "OMAPI_OP_OPEN";
+ case OMAPI_OP_REFRESH: return "OMAPI_OP_REFRESH";
+--
+2.15.1
+
--
2.15.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6
2017-12-12 19:51 [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6 Baruch Siach
2017-12-12 19:51 ` [Buildroot] [PATCH 2/2] dhcp: add upstream security fix Baruch Siach
@ 2017-12-13 13:20 ` Thomas Petazzoni
2017-12-27 11:57 ` Peter Korsgaard
2017-12-30 22:40 ` Peter Korsgaard
3 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2017-12-13 13:20 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 12 Dec 2017 21:51:34 +0200, Baruch Siach wrote:
> Renumber the patch.
>
> Add license hash.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> ...{0002-bind-cross-compile.patch => 0001-bind-cross-compile.patch} | 0
> package/dhcp/dhcp.hash | 6 ++++--
> package/dhcp/dhcp.mk | 2 +-
> 3 files changed, 5 insertions(+), 3 deletions(-)
> rename package/dhcp/{0002-bind-cross-compile.patch => 0001-bind-cross-compile.patch} (100%)
Both applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6
2017-12-12 19:51 [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6 Baruch Siach
2017-12-12 19:51 ` [Buildroot] [PATCH 2/2] dhcp: add upstream security fix Baruch Siach
2017-12-13 13:20 ` [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6 Thomas Petazzoni
@ 2017-12-27 11:57 ` Peter Korsgaard
2017-12-30 22:40 ` Peter Korsgaard
3 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2017-12-27 11:57 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> Renumber the patch.
> Add license hash.
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed to 2017.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6
2017-12-12 19:51 [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6 Baruch Siach
` (2 preceding siblings ...)
2017-12-27 11:57 ` Peter Korsgaard
@ 2017-12-30 22:40 ` Peter Korsgaard
3 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2017-12-30 22:40 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> Renumber the patch.
> Add license hash.
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-12-30 22:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-12 19:51 [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6 Baruch Siach
2017-12-12 19:51 ` [Buildroot] [PATCH 2/2] dhcp: add upstream security fix Baruch Siach
2017-12-27 11:57 ` Peter Korsgaard
2017-12-30 22:40 ` Peter Korsgaard
2017-12-13 13:20 ` [Buildroot] [PATCH 1/2] dhcp: bump to version 4.3.6 Thomas Petazzoni
2017-12-27 11:57 ` Peter Korsgaard
2017-12-30 22:40 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox