diff options
| author | Li Zhou <li.zhou@windriver.com> | 2016-11-23 12:10:40 +0800 |
|---|---|---|
| committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-12-14 09:20:09 -0500 |
| commit | a0ee08d75ca3ee4e6a2eac4079f39e2e52e56aef (patch) | |
| tree | 3558442db4bb4d240b497077e4adb37f3dea2907 | |
| parent | 50169dcce2a65e3e48505c821d2a49d52f94f572 (diff) | |
| download | meta-openembedded-a0ee08d75ca3ee4e6a2eac4079f39e2e52e56aef.tar.gz | |
net-snmp: snmplib, UDPIPv6 transport: Add a missing return statement
Backport a succeeding commit from net-snmp upstream to fix the issue
introduced by commit
<BUG#a2584: Fix snmptrap to use clientaddr from snmp.conf>.
The missing return will cause crash when binding to a non-exist IPv6
address.
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
| -rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch | 29 | ||||
| -rw-r--r-- | meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch new file mode 100644 index 0000000000..6255f7ced3 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From 1ee72102fbe722d232d74abc4660a8b134cec8d6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bart Van Assche <bvanassche@acm.org> | ||
| 3 | Date: Sat, 23 May 2015 07:32:53 +0200 | ||
| 4 | Subject: [PATCH] snmplib, UDPIPv6 transport: Add a missing return statement | ||
| 5 | |||
| 6 | Detected by Coverity. | ||
| 7 | |||
| 8 | Upstream-Status: backport | ||
| 9 | |||
| 10 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | ||
| 11 | --- | ||
| 12 | snmplib/transports/snmpUDPIPv6Domain.c | 1 + | ||
| 13 | 1 file changed, 1 insertion(+) | ||
| 14 | |||
| 15 | diff --git a/snmplib/transports/snmpUDPIPv6Domain.c b/snmplib/transports/snmpUDPIPv6Domain.c | ||
| 16 | index 029b164..11c39bb 100644 | ||
| 17 | --- a/snmplib/transports/snmpUDPIPv6Domain.c | ||
| 18 | +++ b/snmplib/transports/snmpUDPIPv6Domain.c | ||
| 19 | @@ -285,6 +285,7 @@ netsnmp_udp6_transport(struct sockaddr_in6 *addr, int local) | ||
| 20 | errno, strerror(errno))); | ||
| 21 | netsnmp_socketbase_close(t); | ||
| 22 | netsnmp_transport_free(t); | ||
| 23 | + return NULL; | ||
| 24 | } | ||
| 25 | } | ||
| 26 | /* | ||
| 27 | -- | ||
| 28 | 2.9.3 | ||
| 29 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb index 140028722d..79e7766e9f 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb | |||
| @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \ | |||
| 25 | file://net-snmp-agentx-crash.patch \ | 25 | file://net-snmp-agentx-crash.patch \ |
| 26 | file://0001-get_pid_from_inode-Include-limit.h.patch \ | 26 | file://0001-get_pid_from_inode-Include-limit.h.patch \ |
| 27 | file://0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch \ | 27 | file://0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch \ |
| 28 | file://0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch \ | ||
| 28 | " | 29 | " |
| 29 | SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee" | 30 | SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee" |
| 30 | SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e" | 31 | SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e" |
