From a6c0cefedd1616e2ca0a4b6ffa0461b5b51d6eb32c0352d6841d69a43fa167ba Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 9 Oct 2018 09:23:58 +0000
Subject: [PATCH] Accepting request 640701 from
 home:abergmann:branches:network:utilities

- Fix remote DoS in agent/helpers/table.c (bsc#1111122, CVE-2018-18065)
  Add net-snmp-5.7.3-helpers-table-skip-if-next-handler-called.patch

OBS-URL: https://build.opensuse.org/request/show/640701
OBS-URL: https://build.opensuse.org/package/show/network:utilities/net-snmp?expand=0&rev=14
---
 ...rs-table-skip-if-next-handler-called.patch | 21 +++++++++++++++++++
 net-snmp.changes                              |  6 ++++++
 net-snmp.spec                                 |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 net-snmp-5.7.3-helpers-table-skip-if-next-handler-called.patch

diff --git a/net-snmp-5.7.3-helpers-table-skip-if-next-handler-called.patch b/net-snmp-5.7.3-helpers-table-skip-if-next-handler-called.patch
new file mode 100644
index 0000000..1765240
--- /dev/null
+++ b/net-snmp-5.7.3-helpers-table-skip-if-next-handler-called.patch
@@ -0,0 +1,21 @@
+diff -Nurp net-snmp-5.7.3-orig/agent/helpers/table.c net-snmp-5.7.3/agent/helpers/table.c
+--- net-snmp-5.7.3-orig/agent/helpers/table.c	2014-12-08 21:23:22.000000000 +0100
++++ net-snmp-5.7.3/agent/helpers/table.c	2018-10-09 00:54:37.410522720 +0200
+@@ -406,6 +406,8 @@ table_helper_handler(netsnmp_mib_handler
+             if (reqinfo->mode == MODE_GET)
+                 table_helper_cleanup(reqinfo, request,
+                                      SNMP_NOSUCHOBJECT);
++            else
++                request->processed = 1; /* skip if next handler called */
+             continue;
+         }
+ 
+@@ -483,6 +485,8 @@ table_helper_handler(netsnmp_mib_handler
+ #endif /* NETSNMP_NO_WRITE_SUPPORT */
+                     table_helper_cleanup(reqinfo, request,
+                                          SNMP_NOSUCHOBJECT);
++                else
++                    request->processed = 1; /* skip if next handler called */
+                 continue;
+             }
+             /*
diff --git a/net-snmp.changes b/net-snmp.changes
index fb4cbee..41ed352 100644
--- a/net-snmp.changes
+++ b/net-snmp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct  8 23:44:37 UTC 2018 - abergmann@suse.com
+
+- Fix remote DoS in agent/helpers/table.c (bsc#1111122, CVE-2018-18065)
+  Add net-snmp-5.7.3-helpers-table-skip-if-next-handler-called.patch
+
 -------------------------------------------------------------------
 Mon Jun 18 13:50:35 CEST 2018 - kukuk@suse.de
 
diff --git a/net-snmp.spec b/net-snmp.spec
index 0652532..0e3d65c 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -64,6 +64,7 @@ Patch13:        net-snmp-5.7.3-build-with-openssl-1.1.patch
 Patch14:        net-snmp-5.7.3-modern-rpm-api.patch
 Patch15:        net-snmp-python3.patch
 Patch16:        net-snmp-5.7.2-systemd.patch
+Patch17:        net-snmp-5.7.3-helpers-table-skip-if-next-handler-called.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  autoconf