|
 |
80dbd0 |
From 4589352dac3ae111c7621298cf231742209efd9b Mon Sep 17 00:00:00 2001
|
|
|
80dbd0 |
From: Bill Fenner <fenner@gmail.com>
|
|
|
80dbd0 |
Date: Fri, 25 Nov 2022 08:41:24 -0800
|
|
|
80dbd0 |
Subject: [PATCH 1/3] snmp_agent: disallow SET with NULL varbind
|
|
|
80dbd0 |
|
|
|
80dbd0 |
---
|
|
|
80dbd0 |
agent/snmp_agent.c | 32 ++++++++++++++++++++++++++++++++
|
|
|
80dbd0 |
1 file changed, 32 insertions(+)
|
|
|
80dbd0 |
|
|
|
80dbd0 |
diff --git a/agent/snmp_agent.c b/agent/snmp_agent.c
|
|
|
80dbd0 |
index 867d0c166f..3f678fe2df 100644
|
|
|
80dbd0 |
--- a/agent/snmp_agent.c
|
|
|
80dbd0 |
+++ b/agent/snmp_agent.c
|
|
|
80dbd0 |
@@ -3719,12 +3719,44 @@ netsnmp_handle_request(netsnmp_agent_session *asp, int status)
|
|
|
80dbd0 |
return 1;
|
|
|
80dbd0 |
}
|
|
|
80dbd0 |
|
|
|
80dbd0 |
+static int
|
|
|
80dbd0 |
+check_set_pdu_for_null_varbind(netsnmp_agent_session *asp)
|
|
|
80dbd0 |
+{
|
|
|
80dbd0 |
+ int i;
|
|
|
80dbd0 |
+ netsnmp_variable_list *v = NULL;
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+ for (i = 1, v = asp->pdu->variables; v != NULL; i++, v = v->next_variable) {
|
|
|
80dbd0 |
+ if (v->type == ASN_NULL) {
|
|
|
80dbd0 |
+ /*
|
|
|
80dbd0 |
+ * Protect SET implementations that do not protect themselves
|
|
|
80dbd0 |
+ * against wrong type.
|
|
|
80dbd0 |
+ */
|
|
|
80dbd0 |
+ DEBUGMSGTL(("snmp_agent", "disallowing SET with NULL var for varbind %d\n", i));
|
|
|
80dbd0 |
+ asp->index = i;
|
|
|
80dbd0 |
+ return SNMP_ERR_WRONGTYPE;
|
|
|
80dbd0 |
+ }
|
|
|
80dbd0 |
+ }
|
|
|
80dbd0 |
+ return SNMP_ERR_NOERROR;
|
|
|
80dbd0 |
+}
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
int
|
|
|
80dbd0 |
handle_pdu(netsnmp_agent_session *asp)
|
|
|
80dbd0 |
{
|
|
|
80dbd0 |
int status, inclusives = 0;
|
|
|
80dbd0 |
netsnmp_variable_list *v = NULL;
|
|
|
80dbd0 |
|
|
|
80dbd0 |
+#ifndef NETSNMP_NO_WRITE_SUPPORT
|
|
|
80dbd0 |
+ /*
|
|
|
80dbd0 |
+ * Check for ASN_NULL in SET request
|
|
|
80dbd0 |
+ */
|
|
|
80dbd0 |
+ if (asp->pdu->command == SNMP_MSG_SET) {
|
|
|
80dbd0 |
+ status = check_set_pdu_for_null_varbind(asp);
|
|
|
80dbd0 |
+ if (status != SNMP_ERR_NOERROR) {
|
|
|
80dbd0 |
+ return status;
|
|
|
80dbd0 |
+ }
|
|
|
80dbd0 |
+ }
|
|
|
80dbd0 |
+#endif /* NETSNMP_NO_WRITE_SUPPORT */
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
/*
|
|
|
80dbd0 |
* for illegal requests, mark all nodes as ASN_NULL
|
|
|
80dbd0 |
*/
|
|
|
80dbd0 |
|
|
|
80dbd0 |
From 7f4ac4051cc7fec6a5944661923acb95cec359c7 Mon Sep 17 00:00:00 2001
|
|
|
80dbd0 |
From: Bill Fenner <fenner@gmail.com>
|
|
|
80dbd0 |
Date: Fri, 25 Nov 2022 08:41:46 -0800
|
|
|
80dbd0 |
Subject: [PATCH 2/3] apps: snmpset: allow SET with NULL varbind for testing
|
|
|
80dbd0 |
|
|
|
80dbd0 |
---
|
|
|
80dbd0 |
apps/snmpset.c | 1 +
|
|
|
80dbd0 |
1 file changed, 1 insertion(+)
|
|
|
80dbd0 |
|
|
|
80dbd0 |
diff --git a/apps/snmpset.c b/apps/snmpset.c
|
|
|
80dbd0 |
index 48e14bd513..d542713e1b 100644
|
|
|
80dbd0 |
--- a/apps/snmpset.c
|
|
|
80dbd0 |
+++ b/apps/snmpset.c
|
|
|
80dbd0 |
@@ -182,6 +182,7 @@ main(int argc, char *argv[])
|
|
|
80dbd0 |
case 'x':
|
|
|
80dbd0 |
case 'd':
|
|
|
80dbd0 |
case 'b':
|
|
|
80dbd0 |
+ case 'n': /* undocumented */
|
|
|
80dbd0 |
#ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
|
|
|
80dbd0 |
case 'I':
|
|
|
80dbd0 |
case 'U':
|
|
|
80dbd0 |
|
|
|
80dbd0 |
From 15f9d7f7e5b90c9b419832ed8e6413feb6570d83 Mon Sep 17 00:00:00 2001
|
|
|
80dbd0 |
From: Bill Fenner <fenner@gmail.com>
|
|
|
80dbd0 |
Date: Fri, 25 Nov 2022 10:23:32 -0800
|
|
|
80dbd0 |
Subject: [PATCH 3/3] Add test for NULL varbind set
|
|
|
80dbd0 |
|
|
|
80dbd0 |
---
|
|
|
80dbd0 |
.../default/T0142snmpv2csetnull_simple | 31 +++++++++++++++++++
|
|
|
80dbd0 |
1 file changed, 31 insertions(+)
|
|
|
80dbd0 |
create mode 100644 testing/fulltests/default/T0142snmpv2csetnull_simple
|
|
|
80dbd0 |
|
|
|
80dbd0 |
diff --git a/testing/fulltests/default/T0142snmpv2csetnull_simple b/testing/fulltests/default/T0142snmpv2csetnull_simple
|
|
|
80dbd0 |
new file mode 100644
|
|
|
80dbd0 |
index 0000000000..0f1b8f386b
|
|
|
80dbd0 |
--- /dev/null
|
|
|
80dbd0 |
+++ b/testing/fulltests/default/T0142snmpv2csetnull_simple
|
|
|
80dbd0 |
@@ -0,0 +1,31 @@
|
|
|
80dbd0 |
+#!/bin/sh
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+. ../support/simple_eval_tools.sh
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+HEADER SNMPv2c set of system.sysContact.0 with NULL varbind
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+SKIPIF NETSNMP_DISABLE_SET_SUPPORT
|
|
|
80dbd0 |
+SKIPIF NETSNMP_NO_WRITE_SUPPORT
|
|
|
80dbd0 |
+SKIPIF NETSNMP_DISABLE_SNMPV2C
|
|
|
80dbd0 |
+SKIPIFNOT USING_MIBII_SYSTEM_MIB_MODULE
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+#
|
|
|
80dbd0 |
+# Begin test
|
|
|
80dbd0 |
+#
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+# standard V2C configuration: testcomunnity
|
|
|
80dbd0 |
+snmp_write_access='all'
|
|
|
80dbd0 |
+. ./Sv2cconfig
|
|
|
80dbd0 |
+STARTAGENT
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+CAPTURE "snmpget -On $SNMP_FLAGS -c testcommunity -v 2c $SNMP_TRANSPORT_SPEC:$SNMP_TEST_DEST$SNMP_SNMPD_PORT .1.3.6.1.2.1.1.4.0"
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+CHECK ".1.3.6.1.2.1.1.4.0 = STRING:"
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+CAPTURE "snmpset -On $SNMP_FLAGS -c testcommunity -v 2c $SNMP_TRANSPORT_SPEC:$SNMP_TEST_DEST$SNMP_SNMPD_PORT .1.3.6.1.2.1.1.4.0 n x"
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+CHECK "Reason: wrongType"
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+STOPAGENT
|
|
|
80dbd0 |
+
|
|
|
80dbd0 |
+FINISHED
|
|
|
80dbd0 |
|