From: "plaisthos (Code Review)" Date: Tue, 21 Jan 2025 12:03:06 +0000 References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <3d5210d7256fd4be6341d896ac7e972a62fd6455-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="ias9IyC0Ql8="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Print warnings/errors when numerical parameters cannot be parsed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --ias9IyC0Ql8= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/873?usp=3Demail to review the following change. Change subject: Print warnings/errors when numerical parameters cannot be p= arsed ...................................................................... Print warnings/errors when numerical parameters cannot be parsed Using the atoi method is a best effort method that parses as much of the input string as possible as integer and ignores the rest or return 0 if the string cannot be parsed. This is lead to unexpected results. Change the behaviour by printing a warning in these cases instead. When parsing a configuration, these warnings will error out since the msglevel is M_USAGE in this case. Example: ./src/openvpn/openvpn --resolv-retry 198jj Options error: Cannot parse argument '198jj' as non-negative integer Reported-By: Anqi Chen Reported-By: Cristina Nita-Rotaru Change-Id: Ie1e2eb54d516b3ae87c5ca56fe8edd77ee2be4de --- M src/openvpn/options.c 1 file changed, 109 insertions(+), 77 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/73/873/1 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 93b8417..6b9f204 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -4926,11 +4926,43 @@ } #endif +/** + * Converts a str to a positive number if the string represents a postive + * integer number. Otherwise print a warning with msglevel and return 0 + */ static int -positive_atoi(const char *str) +positive_atoi(const char *str, int msglevel) { - const int i =3D atoi(str); - return i < 0 ? 0 : i; + char *endptr; + long long i =3D strtoll(str, &endptr, 10); + + if (i < 0 || endptr || i > INT_MAX) + { + msg(msglevel, "Cannot parse argument '%s' as non-negative integer", + str); + i =3D 0; + } + + return (int) i; +} + +/** + * Converts a str to an integer if the string can be represented as an + * integer number. Otherwise print a warning with msglevel and return 0 + */ +static int +atoi_warn(const char *str, int msglevel) +{ + char *endptr; + long long i =3D strtoll(str, &endptr, 10); + + if (i < INT_MIN || endptr || i > INT_MAX) + { + msg(msglevel, "Cannot parse argument '%s' as integer", str); + i =3D 0; + } + + return (int) i; } #ifdef _WIN32 /* This function is only used when compiling on Windows */ @@ -5955,7 +5987,7 @@ int cache; VERIFY_PERMISSION(OPT_P_GENERAL); - cache =3D atoi(p[1]); + cache =3D atoi_warn(p[1], msglevel); if (cache < 1) { msg(msglevel, "--management-log-cache parameter is out of rang= e"); @@ -6250,7 +6282,7 @@ } else { - options->resolve_retry_seconds =3D positive_atoi(p[1]); + options->resolve_retry_seconds =3D positive_atoi(p[1], msgleve= l); } } else if ((streq(p[0], "preresolve") || streq(p[0], "ip-remote-hint")) = && !p[2]) @@ -6267,7 +6299,7 @@ else if (streq(p[0], "connect-retry") && p[1] && !p[3]) { VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION); - options->ce.connect_retry_seconds =3D positive_atoi(p[1]); + options->ce.connect_retry_seconds =3D positive_atoi(p[1], msglevel= ); /* * Limit the base value of retry wait interval to 16 bits to avoid * overflow when scaled up for exponential backoff @@ -6282,19 +6314,19 @@ if (p[2]) { options->ce.connect_retry_seconds_max =3D - max_int(positive_atoi(p[2]), options->ce.connect_retry_sec= onds); + max_int(positive_atoi(p[2], msglevel), options->ce.connect= _retry_seconds); } } else if ((streq(p[0], "connect-timeout") || streq(p[0], "server-poll-t= imeout")) && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION); - options->ce.connect_timeout =3D positive_atoi(p[1]); + options->ce.connect_timeout =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "connect-retry-max") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION); - options->connect_retry_max =3D positive_atoi(p[1]); + options->connect_retry_max =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "ipchange") && p[1]) { @@ -6317,7 +6349,7 @@ else if (streq(p[0], "gremlin") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_GENERAL); - options->gremlin =3D positive_atoi(p[1]); + options->gremlin =3D positive_atoi(p[1], msglevel); } #endif else if (streq(p[0], "chroot") && p[1] && !p[2]) @@ -6449,7 +6481,7 @@ else if (streq(p[0], "verb") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_MESSAGES); - options->verbosity =3D positive_atoi(p[1]); + options->verbosity =3D positive_atoi(p[1], msglevel); if (options->verbosity >=3D (D_TLS_DEBUG_MED & M_DEBUG_LEVEL)) { /* We pass this flag to the SSL library to avoid @@ -6468,7 +6500,7 @@ else if (streq(p[0], "mute") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_MESSAGES); - options->mute =3D positive_atoi(p[1]); + options->mute =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "errors-to-stderr") && !p[1]) { @@ -6481,7 +6513,7 @@ options->status_file =3D p[1]; if (p[2]) { - options->status_file_update_freq =3D positive_atoi(p[2]); + options->status_file_update_freq =3D positive_atoi(p[2], msgle= vel); } } else if (streq(p[0], "status-version") && p[1] && !p[2]) @@ -6489,7 +6521,7 @@ int version; VERIFY_PERMISSION(OPT_P_GENERAL); - version =3D atoi(p[1]); + version =3D atoi_warn(p[1], msglevel); if (version < 1 || version > 3) { msg(msglevel, "--status-version must be 1 to 3"); @@ -6517,17 +6549,17 @@ else if ((streq(p[0], "link-mtu") || streq(p[0], "udp-mtu")) && p[1] &= & !p[2]) { VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION); - options->ce.link_mtu =3D positive_atoi(p[1]); + options->ce.link_mtu =3D positive_atoi(p[1], msglevel); options->ce.link_mtu_defined =3D true; } else if (streq(p[0], "tun-mtu") && p[1] && !p[3]) { VERIFY_PERMISSION(OPT_P_PUSH_MTU|OPT_P_CONNECTION); - options->ce.tun_mtu =3D positive_atoi(p[1]); + options->ce.tun_mtu =3D positive_atoi(p[1], msglevel); options->ce.tun_mtu_defined =3D true; if (p[2]) { - options->ce.occ_mtu =3D positive_atoi(p[2]); + options->ce.occ_mtu =3D positive_atoi(p[2], msglevel); } else { @@ -6537,7 +6569,7 @@ else if (streq(p[0], "tun-mtu-max") && p[1] && !p[3]) { VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION); - int max_mtu =3D positive_atoi(p[1]); + int max_mtu =3D positive_atoi(p[1], msglevel); if (max_mtu < 68 || max_mtu > 65536) { msg(msglevel, "--tun-mtu-max value '%s' is invalid", p[1]); @@ -6550,13 +6582,13 @@ else if (streq(p[0], "tun-mtu-extra") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION); - options->ce.tun_mtu_extra =3D positive_atoi(p[1]); + options->ce.tun_mtu_extra =3D positive_atoi(p[1], msglevel); options->ce.tun_mtu_extra_defined =3D true; } else if (streq(p[0], "max-packet-size") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION); - int maxmtu =3D positive_atoi(p[1]); + int maxmtu =3D positive_atoi(p[1], msglevel); options->ce.tls_mtu =3D constrain_int(maxmtu, TLS_CHANNEL_MTU_MIN,= TLS_CHANNEL_BUF_SIZE); =20 if (maxmtu < TLS_CHANNEL_MTU_MIN || maxmtu > TLS_CHANNEL_BUF_SIZE) @@ -6582,7 +6614,7 @@ else if (streq(p[0], "fragment") && p[1] && !p[3]) { VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION); - options->ce.fragment =3D positive_atoi(p[1]); + options->ce.fragment =3D positive_atoi(p[1], msglevel); if (options->ce.fragment < 68) { @@ -6613,23 +6645,23 @@ else if (streq(p[0], "nice") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_NICE); - options->nice =3D atoi(p[1]); + options->nice =3D atoi_warn(p[1], msglevel); } else if (streq(p[0], "rcvbuf") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_SOCKBUF); - options->rcvbuf =3D positive_atoi(p[1]); + options->rcvbuf =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "sndbuf") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_SOCKBUF); - options->sndbuf =3D positive_atoi(p[1]); + options->sndbuf =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "mark") && p[1] && !p[2]) { #if defined(TARGET_LINUX) && HAVE_DECL_SO_MARK VERIFY_PERMISSION(OPT_P_GENERAL); - options->mark =3D atoi(p[1]); + options->mark =3D atoi_warn(p[1], msglevel); #endif } else if (streq(p[0], "socket-flags")) @@ -6659,7 +6691,7 @@ { VERIFY_PERMISSION(OPT_P_GENERAL); #ifdef TARGET_LINUX - options->tuntap_options.txqueuelen =3D positive_atoi(p[1]); + options->tuntap_options.txqueuelen =3D positive_atoi(p[1], msgleve= l); #else msg(msglevel, "--txqueuelen not supported on this OS"); goto err; @@ -6670,7 +6702,7 @@ int shaper; VERIFY_PERMISSION(OPT_P_SHAPER); - shaper =3D atoi(p[1]); + shaper =3D atoi_warn(p[1], msglevel); if (shaper < SHAPER_MIN || shaper > SHAPER_MAX) { msg(msglevel, "Bad shaper value, must be between %d and %d", @@ -6718,7 +6750,7 @@ else if (streq(p[0], "inactive") && p[1] && !p[3]) { VERIFY_PERMISSION(OPT_P_TIMER); - options->inactivity_timeout =3D positive_atoi(p[1]); + options->inactivity_timeout =3D positive_atoi(p[1], msglevel); if (p[2]) { int64_t val =3D atoll(p[2]); @@ -6736,7 +6768,7 @@ else if (streq(p[0], "session-timeout") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_TIMER); - options->session_timeout =3D positive_atoi(p[1]); + options->session_timeout =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "proto") && p[1] && !p[2]) { @@ -6903,24 +6935,24 @@ else if (streq(p[0], "keepalive") && p[1] && p[2] && !p[3]) { VERIFY_PERMISSION(OPT_P_GENERAL); - options->keepalive_ping =3D atoi(p[1]); - options->keepalive_timeout =3D atoi(p[2]); + options->keepalive_ping =3D atoi_warn(p[1], msglevel); + options->keepalive_timeout =3D atoi_warn(p[1], msglevel); } else if (streq(p[0], "ping") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_TIMER); - options->ping_send_timeout =3D positive_atoi(p[1]); + options->ping_send_timeout =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "ping-exit") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_TIMER); - options->ping_rec_timeout =3D positive_atoi(p[1]); + options->ping_rec_timeout =3D positive_atoi(p[1], msglevel); options->ping_rec_timeout_action =3D PING_EXIT; } else if (streq(p[0], "ping-restart") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_TIMER); - options->ping_rec_timeout =3D positive_atoi(p[1]); + options->ping_rec_timeout =3D positive_atoi(p[1], msglevel); options->ping_rec_timeout_action =3D PING_RESTART; } else if (streq(p[0], "ping-timer-rem") && !p[1]) @@ -6933,7 +6965,7 @@ VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION|OPT_P_EXPLICIT_NO= TIFY); if (p[1]) { - options->ce.explicit_exit_notification =3D positive_atoi(p[1]); + options->ce.explicit_exit_notification =3D positive_atoi(p[1],= msglevel); } else { @@ -7053,7 +7085,7 @@ else if (streq(p[0], "route-metric") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_ROUTE); - options->route_default_metric =3D positive_atoi(p[1]); + options->route_default_metric =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "route-delay") && !p[3]) { @@ -7061,10 +7093,10 @@ options->route_delay_defined =3D true; if (p[1]) { - options->route_delay =3D positive_atoi(p[1]); + options->route_delay =3D positive_atoi(p[1], msglevel); if (p[2]) { - options->route_delay_window =3D positive_atoi(p[2]); + options->route_delay_window =3D positive_atoi(p[2], msglev= el); } } else @@ -7229,7 +7261,7 @@ } else if (streq(p[1], "SERVER_POLL_TIMEOUT") && p[2]) { - options->ce.connect_timeout =3D positive_atoi(p[2]); + options->ce.connect_timeout =3D positive_atoi(p[2], msglevel); } else { @@ -7261,14 +7293,14 @@ else if (streq(p[0], "script-security") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_GENERAL); - script_security_set(atoi(p[1])); + script_security_set(atoi_warn(p[1], msglevel)); } else if (streq(p[0], "mssfix") && !p[3]) { VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION); if (p[1]) { - int mssfix =3D positive_atoi(p[1]); + int mssfix =3D positive_atoi(p[1], msglevel); /* can be 0, but otherwise it needs to be high enough so we can * substract room for headers. */ if (mssfix !=3D 0 @@ -7451,7 +7483,7 @@ options->ifconfig_pool_persist_filename =3D p[1]; if (p[2]) { - options->ifconfig_pool_persist_refresh_freq =3D positive_atoi(= p[2]); + options->ifconfig_pool_persist_refresh_freq =3D positive_atoi(= p[2], msglevel); } } else if (streq(p[0], "ifconfig-ipv6-pool") && p[1] && !p[2]) @@ -7483,8 +7515,8 @@ int real, virtual; VERIFY_PERMISSION(OPT_P_GENERAL); - real =3D atoi(p[1]); - virtual =3D atoi(p[2]); + real =3D atoi_warn(p[1], msglevel); + virtual =3D atoi_warn(p[1], msglevel); if (real < 1 || virtual < 1) { msg(msglevel, "--hash-size sizes must be >=3D 1 (preferably a = power of 2)"); @@ -7498,8 +7530,8 @@ int cf_max, cf_per; =20 VERIFY_PERMISSION(OPT_P_GENERAL); - cf_max =3D atoi(p[1]); - cf_per =3D atoi(p[2]); + cf_max =3D atoi_warn(p[1], msglevel); + cf_per =3D atoi_warn(p[1], msglevel); if (cf_max < 0 || cf_per < 0) { msg(msglevel, "--connect-freq parms must be > 0"); @@ -7529,7 +7561,7 @@ int max_clients; VERIFY_PERMISSION(OPT_P_GENERAL); - max_clients =3D atoi(p[1]); + max_clients =3D atoi_warn(p[1], msglevel); if (max_clients < 0) { msg(msglevel, "--max-clients must be at least 1"); @@ -7545,7 +7577,7 @@ else if (streq(p[0], "max-routes-per-client") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_INHERIT); - options->max_routes_per_client =3D max_int(atoi(p[1]), 1); + options->max_routes_per_client =3D max_int(positive_atoi(p[1], msg= level), 1); } else if (streq(p[0], "client-cert-not-required") && !p[1]) { @@ -7629,14 +7661,14 @@ { VERIFY_PERMISSION(OPT_P_GENERAL); options->auth_token_generate =3D true; - options->auth_token_lifetime =3D p[1] ? positive_atoi(p[1]) : 0; + options->auth_token_lifetime =3D p[1] ? positive_atoi(p[1], msglev= el) : 0; for (int i =3D 2; i < MAX_PARMS && p[i] !=3D NULL; i++) { /* the second parameter can be the renewal time */ - if (i =3D=3D 2 && positive_atoi(p[i])) + if (i =3D=3D 2 && positive_atoi(p[i], msglevel)) { - options->auth_token_renewal =3D positive_atoi(p[i]); + options->auth_token_renewal =3D positive_atoi(p[i], msglev= el); } else if (streq(p[i], "external-auth")) { @@ -7716,7 +7748,7 @@ int n_bcast_buf; VERIFY_PERMISSION(OPT_P_GENERAL); - n_bcast_buf =3D atoi(p[1]); + n_bcast_buf =3D atoi_warn(p[1], msglevel); if (n_bcast_buf < 1) { msg(msglevel, "--bcast-buffers parameter must be > 0"); @@ -7728,7 +7760,7 @@ int tcp_queue_limit; VERIFY_PERMISSION(OPT_P_GENERAL); - tcp_queue_limit =3D atoi(p[1]); + tcp_queue_limit =3D atoi_warn(p[1], msglevel); if (tcp_queue_limit < 1) { msg(msglevel, "--tcp-queue-limit parameter must be > 0"); @@ -7876,10 +7908,10 @@ int ageing_time, check_interval; VERIFY_PERMISSION(OPT_P_GENERAL); - ageing_time =3D atoi(p[1]); + ageing_time =3D atoi_warn(p[1], msglevel); if (p[2]) { - check_interval =3D atoi(p[2]); + check_interval =3D atoi_warn(p[1], msglevel); } else { @@ -7908,7 +7940,7 @@ else if (streq(p[0], "push-continuation") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_PULL_MODE); - options->push_continuation =3D atoi(p[1]); + options->push_continuation =3D atoi_warn(p[1], msglevel); } else if (streq(p[0], "auth-user-pass") && !p[2]) { @@ -7933,7 +7965,7 @@ { VERIFY_PERMISSION(OPT_P_GENERAL); options->sc_info.challenge_text =3D p[1]; - if (atoi(p[2])) + if (atoi_warn(p[1], msglevel)) { options->sc_info.flags |=3D SC_ECHO; } @@ -8029,7 +8061,7 @@ { if (!streq(p[2], "default")) { - int offset =3D atoi(p[2]); + int offset =3D options_atoi(p[1], msglevel); if (!(offset > -256 && offset < 256)) { @@ -8045,7 +8077,7 @@ { const int min_lease =3D 30; int lease_time; - lease_time =3D atoi(p[3]); + lease_time =3D options_atoi(p[1], msglevel); if (lease_time < min_lease) { msg(msglevel, "--ip-win32 dynamic [offset] [lease-= time]: lease time parameter (%d) must be at least %d seconds", lease_time, = min_lease); @@ -8169,7 +8201,7 @@ else if (streq(p[1], "NBT") && p[2] && !p[3]) { int t; - t =3D atoi(p[2]); + t =3D options_atoi(p[1], msglevel); if (!(t =3D=3D 1 || t =3D=3D 2 || t =3D=3D 4 || t =3D=3D 8)) { msg(msglevel, "--dhcp-option NBT: parameter (%d) must be 1= , 2, 4, or 8", t); @@ -8227,7 +8259,7 @@ #if defined(TARGET_ANDROID) else if (streq(p[1], "PROXY_HTTP") && p[3] && !p[4]) { - o->http_proxy_port =3D atoi(p[3]); + o->http_proxy_port =3D options_atoi(p[1], msglevel); o->http_proxy =3D p[2]; } #endif @@ -8261,7 +8293,7 @@ { int s; VERIFY_PERMISSION(OPT_P_DHCPDNS); - s =3D atoi(p[1]); + s =3D options_atoi(p[1], msglevel); if (s < 0 || s >=3D 256) { msg(msglevel, "--tap-sleep parameter must be between 0 and 255= "); @@ -8344,7 +8376,7 @@ options->exit_event_name =3D p[1]; if (p[2]) { - options->exit_event_initial_state =3D (atoi(p[2]) !=3D 0); + options->exit_event_initial_state =3D (options_atoi(p[1], msgl= evel) !=3D 0); } } else if (streq(p[0], "allow-nonadmin") && !p[2]) @@ -8711,7 +8743,7 @@ { int replay_window; - replay_window =3D atoi(p[1]); + replay_window =3D atoi_warn(p[1], msglevel); if (!(MIN_SEQ_BACKTRACK <=3D replay_window && replay_window <= =3D MAX_SEQ_BACKTRACK)) { msg(msglevel, "replay-window window size parameter (%d) mu= st be between %d and %d", @@ -8726,7 +8758,7 @@ { int replay_time; - replay_time =3D atoi(p[2]); + replay_time =3D atoi_warn(p[1], msglevel); if (!(MIN_TIME_BACKTRACK <=3D replay_time && replay_time <= =3D MAX_TIME_BACKTRACK)) { msg(msglevel, "replay-window time window parameter (%d= ) must be between %d and %d", @@ -9168,7 +9200,7 @@ else if (streq(p[0], "tls-timeout") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_TLS_PARMS); - options->tls_timeout =3D positive_atoi(p[1]); + options->tls_timeout =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "reneg-bytes") && p[1] && !p[2]) { @@ -9197,21 +9229,21 @@ else if (streq(p[0], "reneg-sec") && p[1] && !p[3]) { VERIFY_PERMISSION(OPT_P_TLS_PARMS); - options->renegotiate_seconds =3D positive_atoi(p[1]); + options->renegotiate_seconds =3D positive_atoi(p[1], msglevel); if (p[2]) { - options->renegotiate_seconds_min =3D positive_atoi(p[2]); + options->renegotiate_seconds_min =3D positive_atoi(p[2], msgle= vel); } } else if (streq(p[0], "hand-window") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_TLS_PARMS); - options->handshake_window =3D positive_atoi(p[1]); + options->handshake_window =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "tran-window") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_TLS_PARMS); - options->transition_window =3D positive_atoi(p[1]); + options->transition_window =3D positive_atoi(p[1], msglevel); } else if (streq(p[0], "tls-auth") && p[1] && !p[3]) { @@ -9348,7 +9380,7 @@ else if (streq(p[0], "show-pkcs11-ids") && !p[3]) { char *provider =3D p[1]; - bool cert_private =3D (p[2] =3D=3D NULL ? false : ( atoi(p[2]) != =3D 0 )); + bool cert_private =3D (p[2] =3D=3D NULL ? false : (atoi_warn(p[1],= msglevel) !=3D 0 )); #ifdef DEFAULT_PKCS11_MODULE if (!provider) @@ -9400,7 +9432,7 @@ for (j =3D 1; j < MAX_PARMS && p[j] !=3D NULL; ++j) { - options->pkcs11_protected_authentication[j-1] =3D atoi(p[j]) != =3D 0 ? 1 : 0; + options->pkcs11_protected_authentication[j-1] =3D atoi_warn(p[= j], msglevel) !=3D 0 ? 1 : 0; } } else if (streq(p[0], "pkcs11-private-mode") && p[1]) @@ -9422,13 +9454,13 @@ for (j =3D 1; j < MAX_PARMS && p[j] !=3D NULL; ++j) { - options->pkcs11_cert_private[j-1] =3D atoi(p[j]) !=3D 0 ? 1 : = 0; + options->pkcs11_cert_private[j-1] =3D atoi_warn(p[j], msglevel= ) !=3D 0 ? 1 : 0; } } else if (streq(p[0], "pkcs11-pin-cache") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_GENERAL); - options->pkcs11_pin_cache_period =3D atoi(p[1]); + options->pkcs11_pin_cache_period =3D atoi_warn(p[1], msglevel); } else if (streq(p[0], "pkcs11-id") && p[1] && !p[2]) { @@ -9457,12 +9489,12 @@ { VERIFY_PERMISSION(OPT_P_PEER_ID); options->use_peer_id =3D true; - options->peer_id =3D atoi(p[1]); + options->peer_id =3D atoi_warn(p[1], msglevel); } #ifdef HAVE_EXPORT_KEYING_MATERIAL else if (streq(p[0], "keying-material-exporter") && p[1] && p[2]) { - int ekm_length =3D positive_atoi(p[2]); + int ekm_length =3D positive_atoi(p[2], msglevel); VERIFY_PERMISSION(OPT_P_GENERAL); @@ -9521,7 +9553,7 @@ else if (streq(p[0], "vlan-pvid") && p[1] && !p[2]) { VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_INSTANCE); - options->vlan_pvid =3D positive_atoi(p[1]); + options->vlan_pvid =3D positive_atoi(p[1], msglevel); if (options->vlan_pvid < OPENVPN_8021Q_MIN_VID || options->vlan_pvid > OPENVPN_8021Q_MAX_VID) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/873?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ie1e2eb54d516b3ae87c5ca56fe8edd77ee2be4de Gerrit-Change-Number: 873 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --ias9IyC0Ql8= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos would like flichtenheld to review this change.

Vi= ew Change

Print warnings/errors when numerical parameters cannot be par=
sed

Using the atoi method is a best effort method that parses as muc= h of the
input string as possible as integer and ignores the rest or ret= urn 0
if the string cannot be parsed. This is lead to unexpected results= .

Change the behaviour by printing a warning in these cases instead.= When
parsing a configuration, these warnings will error out since the m= sglevel
is M_USAGE in this case. Example:

./src/openvpn/openv= pn --resolv-retry 198jj
Options error: Cannot parse argument '19= 8jj' as non-negative integer

Reported-By: Anqi Chen <chen.anq= i3@...2855...>
Reported-By: Cristina Nita-Rotaru <c.nitarotaru@...493...= 2855...>
Change-Id: Ie1e2eb54d516b3ae87c5ca56fe8edd77ee2be4de
---<= br>M src/openvpn/options.c
1 file changed, 109 insertions(+), 77 deletio= ns(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/change=
s/73/873/1
diff --git a/src/openvpn/options.c b/src/openvpn/options=
.c
index 93b8417..6b9f204 100644
--- a/src/= openvpn/options.c
+++ b/src/openvpn/options.c
@@ -4926,11 +4926,43 @@
}
#endif

+/**

+ * Converts a str to a = positive number if the string represents a postive
+ * integer number. Otherwise print a warning= with msglevel and return 0
+ */
static int
-positive_atoi(const char *str)
+positive_atoi(const char *str, int msglevel)
{
- = const int i =3D atoi(str);
- return i < 0 ? 0 : i;
+ char *endptr;
+ long long i =3D strtoll(str, &endptr, 10);
+

+ if (i < 0 || endptr || i > INT_MAX)
+ {
+ msg(msglevel, "Cannot pars= e argument '%s' as non-negative integer",
+ str);
+ i =3D 0;
+ }
+
+ = return (int) i;
+}<= /span>
+
+/**
+ * Converts a str to an integer if the string can be re= presented as an
+ * i= nteger number. Otherwise print a warning with msglevel and return 0<= br>+ */
+static int
+atoi_warn(const char *str, int msglevel)+{
+ char *endptr;
+ long long i =3D strtoll(str, &endptr, 10)= ;
+
+ if (i < INT_MIN || endptr || i= > INT_MAX)
+ {=
+ msg(msgleve= l, "Cannot parse argument '%s' as integer", str);<= br>+ i =3D 0;
= + }
+
+ return (int) i;
}
=
#ifdef _WIN32 /* This function is only used when compiling on W= indows */
@@ -5955,7 +5987,7 @@
in= t cache;

VERIFY_PERMISSION(OPT_P= _GENERAL);
- cac= he =3D atoi(p[1]);
+ = cache =3D atoi_warn(p[1], msglevel);
if (ca= che < 1)
{
msg(msg= level, "--management-log-cache parameter is out of range");
@@ -6250,7 +6282,7 @@
}
else

{
- options->resolve_retry_seconds =3D posit= ive_atoi(p[1]);
+ = options->resolve_retry_seconds =3D positive_atoi(p[1], msglevel)= ;
}
}
el= se if ((streq(p[0], "preresolve") || streq(p[0], "ip-remote-= hint")) && !p[2])
@@ -6267,7 +6299,7 @@=
else if (streq(p[0], "connect-retry") && p= [1] && !p[3])
{
VERIF= Y_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION);
- options->ce.connect_retry_seconds =3D po= sitive_atoi(p[1]);
+ = options->ce.connect_retry_seconds =3D positive_atoi(p[1], msgleve= l);
/*
* Limit the base = value of retry wait interval to 16 bits to avoid
= * overflow when scaled up for exponential backoff
@@ -6282,= 19 +6314,19 @@
if (p[2])
= {
options->ce.connect_retry_seconds_max =3D=
- max_i= nt(positive_atoi(p[2]), options->ce.connect_retry_seconds);
+ max_int(positive= _atoi(p[2], msglevel), options->ce.connect_retry_seconds);

}

}
else if ((streq(p= [0], "connect-timeout") || streq(p[0], "server-poll-timeout&= quot;))
&& p[1] && !p[2])
{
VERIFY_PERMISSION(OPT_P_GENERA= L|OPT_P_CONNECTION);
- = options->ce.connect_timeout =3D positive_atoi(p[1]);
+ options->ce.connect_t= imeout =3D positive_atoi(p[1], msglevel);

}
= else if (streq(p[0], "connect-retry-max") && p= [1] && !p[2])
{
VERIF= Y_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION);
- options->connect_retry_max =3D positive_= atoi(p[1]);
+ = options->connect_retry_max =3D positive_atoi(p[1], msglevel);
= }
else if (streq(p[0], "ipchange"= ) && p[1])
{
@@ -6317,7 +6349,= 7 @@
else if (streq(p[0], "gremlin") &&a= mp; p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_GENERAL);
- options->gremlin =3D positive_atoi(p[1]);
= + options->gremlin = =3D positive_atoi(p[1], msglevel);
}
= #endif
else if (streq(p[0], "chroot") &&= amp; p[1] && !p[2])
@@ -6449,7 +6481,7 @@ else if (streq(p[0], "verb") && p[1] &&am= p; !p[2])
{
VERIFY_PERMISSION= (OPT_P_MESSAGES);
- = options->verbosity =3D positive_atoi(p[1]);
+ options->verbosity =3D positive_a= toi(p[1], msglevel);
if (options->verbosity >= ;=3D (D_TLS_DEBUG_MED & M_DEBUG_LEVEL))
{
/* We pass this flag to the SSL library to avoid
@@ -6468,7 +6500,7 @@
else if (streq(p[= 0], "mute") && p[1] && !p[2])
= {
VERIFY_PERMISSION(OPT_P_MESSAGES);
<= span style=3D"color: hsl(0, 100%, 40%);">- options->mute =3D posi= tive_atoi(p[1]);

+ = options->mute =3D positive_atoi(p[1], msglevel);
= }
else if (streq(p[0], "errors-to-stderr"= ) && !p[1])
{
@@ -6481,7 +6513= ,7 @@
options->status_file =3D p[1];
= if (p[2])
{
- options->status_file_update_= freq =3D positive_atoi(p[2]);
+ options->status_file_update_freq =3D positive_atoi= (p[2], msglevel);
}
}<= br> else if (streq(p[0], "status-version") && p= [1] && !p[2])
@@ -6489,7 +6521,7 @@
int version;


VERIFY_PE= RMISSION(OPT_P_GENERAL);
+ version =3D atoi_warn(p[1], msglevel);
if (version < 1 || version > 3)
= {
msg(msglevel, "--status-version must be= 1 to 3");
@@ -6517,17 +6549,17 @@
= else if ((streq(p[0], "link-mtu") || streq(p[0], "udp-mtu&= quot;)) && p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION);
- options->ce.link_mtu =3D= positive_atoi(p[1]);
+ options->ce.link_mtu =3D positive_atoi(p[1], msglevel);=
options->ce.link_mtu_defined =3D true;
}
else if (streq(p[0], "tun-mtu") &am= p;& p[1] && !p[3])
{
= VERIFY_PERMISSION(OPT_P_PUSH_MTU|OPT_P_CONNECTION);
- options->ce.tun_mtu =3D positi= ve_atoi(p[1]);
+ = options->ce.tun_mtu =3D positive_atoi(p[1], msglevel);
options->ce.tun_mtu_defined =3D true;
= if (p[2])
{
- options->ce.occ_mtu =3D positive_atoi(p[2])= ;
+ option= s->ce.occ_mtu =3D positive_atoi(p[2], msglevel);
= }
else
{
@@ -6537,7 +6569,7 @@
else if (streq(p[0], "tun= -mtu-max") && p[1] && !p[3])
{
VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION);
- int max_mtu =3D pos= itive_atoi(p[1]);
+ = int max_mtu =3D positive_atoi(p[1], msglevel);
= if (max_mtu < 68 || max_mtu > 65536)
{
msg(msglevel, "--tun-mtu-max value '%s&= #39; is invalid", p[1]);
@@ -6550,13 +6582,13 @@
else if (streq(p[0], "tun-mtu-extra") && = p[1] && !p[2])
{
VERI= FY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION);
- options->ce.tun_mtu_extra =3D positive_atoi= (p[1]);
+ opti= ons->ce.tun_mtu_extra =3D positive_atoi(p[1], msglevel);
options->ce.tun_mtu_extra_defined =3D true;

= }
else if (streq(p[0], "max-packet-size")= && p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION);
- int maxmtu =3D positive_atoi(p[1])= ;
+ int maxmtu= =3D positive_atoi(p[1], msglevel);
options->ce= .tls_mtu =3D constrain_int(maxmtu, TLS_CHANNEL_MTU_MIN, TLS_CHANNEL_BUF_SIZ= E);

if (maxmtu < TLS_CHANNEL_= MTU_MIN || maxmtu > TLS_CHANNEL_BUF_SIZE)
@@ -6582,7 +66= 14,7 @@
else if (streq(p[0], "fragment") &am= p;& p[1] && !p[3])
{
= VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION);
- options->ce.fragment =3D positive_a= toi(p[1]);
+ o= ptions->ce.fragment =3D positive_atoi(p[1], msglevel);
=
if (options->ce.fragment < 68)
{

@@ -6613,23 +6645,23 @@
= else if (streq(p[0], "nice") && p[1] && !p[2])
{
VERIFY_PERMISSION(OPT_P_NICE= );
- options->= ;nice =3D atoi(p[1]);
+ options->nice =3D atoi_warn(p[1], msglevel);
= }
else if (streq(p[0], "rcvbuf") &&a= mp; p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_SOCKBUF);
- options->rcvbuf =3D positive_atoi(p[1]);
<= span style=3D"color: hsl(120, 100%, 40%);">+ options->rcvbuf =3D = positive_atoi(p[1], msglevel);

}
= else if (streq(p[0], "sndbuf") && p[1] && !p[2])<= /span>
{
VERIFY_PERMISSION(OPT_P_SOC= KBUF);
- options= ->sndbuf =3D positive_atoi(p[1]);
+ options->sndbuf =3D positive_atoi(p[1], msgleve= l);
}
else if (streq(p[0], "= mark") && p[1] && !p[2])
{=
#if defined(TARGET_LINUX) && HAVE_DECL_SO_MARK VERIFY_PERMISSION(OPT_P_GENERAL);
- options->mark =3D atoi(p[1]);=
+ options->mark = =3D atoi_warn(p[1], msglevel);
#endif
= }
else if (streq(p[0], "socket-flags"))

@@ -6659,7 +6691,7 @@
{
= VERIFY_PERMISSION(OPT_P_GENERAL);
#ifdef TARGET_LI= NUX
- options-&g= t;tuntap_options.txqueuelen =3D positive_atoi(p[1]);
+ options->tuntap_options.txqueu= elen =3D positive_atoi(p[1], msglevel);
#else
msg(msglevel, "--txqueuelen not supported on this OS"= ;);
goto err;
@@ -6670,7 +6702,7 @= @
int shaper;

= VERIFY_PERMISSION(OPT_P_SHAPER);
- shaper =3D atoi(p[1]);
+ shaper =3D atoi_warn(p[1], msglevel);<= /span>
if (shaper < SHAPER_MIN || shaper > SHAPER_M= AX)
{
msg(msglevel, &= quot;Bad shaper value, must be between %d and %d",
@@ = -6718,7 +6750,7 @@
else if (streq(p[0], "inactive= ") && p[1] && !p[3])
{
= VERIFY_PERMISSION(OPT_P_TIMER);
- options->inactivity_timeout =3D positiv= e_atoi(p[1]);
+ = options->inactivity_timeout =3D positive_atoi(p[1], msglevel);<= br> if (p[2])
{
= int64_t val =3D atoll(p[2]);
@@ -6736,7 +6768,7 @@=
else if (streq(p[0], "session-timeout") &am= p;& p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_TIMER);
- options->session_timeout =3D positive_atoi(p[1]);<= /span>
+ options->= session_timeout =3D positive_atoi(p[1], msglevel);
}
else if (streq(p[0], "proto") && p[1]= && !p[2])
{
@@ -6903,24 +6935= ,24 @@
else if (streq(p[0], "keepalive") &am= p;& p[1] && p[2] && !p[3])
{
VERIFY_PERMISSION(OPT_P_GENERAL);
- options->keepalive_ping =3D atoi= (p[1]);
- option= s->keepalive_timeout =3D atoi(p[2]);
+ options->keepalive_ping =3D atoi_warn(p[1], = msglevel);
+ o= ptions->keepalive_timeout =3D atoi_warn(p[1], msglevel);
}

else if (streq(p[0], "ping") &&a= mp; p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_TIMER);
- options->ping_send_timeout =3D positive_atoi(p[1]);

+ options->pi= ng_send_timeout =3D positive_atoi(p[1], msglevel);
}
else if (streq(p[0], "ping-exit") && = p[1] && !p[2])
{
VERI= FY_PERMISSION(OPT_P_TIMER);
- options->ping_rec_timeout =3D positive_atoi(p[1]);<= br>+ options->ping_re= c_timeout =3D positive_atoi(p[1], msglevel);
optio= ns->ping_rec_timeout_action =3D PING_EXIT;
}=
else if (streq(p[0], "ping-restart") && p[= 1] && !p[2])
{
VERIFY= _PERMISSION(OPT_P_TIMER);
- options->ping_rec_timeout =3D positive_atoi(p[1]);+ options->ping_rec_= timeout =3D positive_atoi(p[1], msglevel);
options= ->ping_rec_timeout_action =3D PING_RESTART;
}
else if (streq(p[0], "ping-timer-rem") &&= !p[1])
@@ -6933,7 +6965,7 @@
VERI= FY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION|OPT_P_EXPLICIT_NOTIFY);=
if (p[1])
{
- options->ce.explicit_exit_= notification =3D positive_atoi(p[1]);
+ options->ce.explicit_exit_notification =3D= positive_atoi(p[1], msglevel);
}
= else
{
@@ -7053,7 +7085,7= @@
else if (streq(p[0], "route-metric") &am= p;& p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_ROUTE);
- options->route_default_metric =3D positive_atoi(p[= 1]);
+ options= ->route_default_metric =3D positive_atoi(p[1], msglevel);
}

else if (streq(p[0], "route-delay")= && !p[3])
{
@@ -7061,10 +7093= ,10 @@
options->route_delay_defined =3D true;
if (p[1])
{
- options->route_delay = =3D positive_atoi(p[1]);

+ options->route_delay =3D positive_atoi(p[1], msglevel);=
if (p[2])
{
- options-&g= t;route_delay_window =3D positive_atoi(p[2]);
+ options->route_delay_window = =3D positive_atoi(p[2], msglevel);
} }
else
@@ -7229,7 = +7261,7 @@
}
else if (str= eq(p[1], "SERVER_POLL_TIMEOUT") && p[2])
= {
- = options->ce.connect_timeout =3D positive_atoi(p[2]);
+ options->ce.connect_tim= eout =3D positive_atoi(p[2], msglevel);
} else
{
@@ -7261,1= 4 +7293,14 @@
else if (streq(p[0], "script-securi= ty") && p[1] && !p[2])
{ VERIFY_PERMISSION(OPT_P_GENERAL);
- script_security_set(atoi(p[1]));
+ script_security_s= et(atoi_warn(p[1], msglevel));
}
= else if (streq(p[0], "mssfix") && !p[3])
= {
VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNE= CTION);
if (p[1])
{
- int mssfix =3D = positive_atoi(p[1]);
= + int mssfix =3D positive_atoi(p[1], msglevel);
= /* can be 0, but otherwise it needs to be high enough so we ca= n
* substract room for headers. */
= if (mssfix !=3D 0
@@ -7451,7 +7483,7 @@<= /span>
options->ifconfig_pool_persist_filename =3D p[1= ];
if (p[2])
{
= - options->ifconfig= _pool_persist_refresh_freq =3D positive_atoi(p[2]);
+ options->ifconfig_pool_per= sist_refresh_freq =3D positive_atoi(p[2], msglevel);
= }
}
else if (streq(p[0], "= ;ifconfig-ipv6-pool") && p[1] && !p[2])
@@ -7483,8 +7515,8 @@

int real, virtual;<= br>
VERIFY_PERMISSION(OPT_P_GENERAL);
- real =3D atoi(p[1])= ;
- virtual =3D = atoi(p[2]);
+ = real =3D atoi_warn(p[1], msglevel);
+ virtual =3D atoi_warn(p[1], msglevel);
if (real < 1 || virtual < 1)

{<= /span>
msg(msglevel, "--hash-size sizes must be = >=3D 1 (preferably a power of 2)");
@@ -7498,8 +753= 0,8 @@
int cf_max, cf_per;

VERIFY_PERMISSION(OPT_P_GENERAL);
- cf_max =3D atoi(p[1]);
- cf_per =3D atoi(p[2]);

+ cf_max =3D atoi= _warn(p[1], msglevel);
- ma= x_clients =3D atoi(p[1]);
+ max_clients =3D atoi_warn(p[1], msglevel);
= if (max_clients < 0)
{
= msg(msglevel, "--max-clients must be at least 1");
@@ -7545,7 +7577,7 @@
else if (streq(p[0= ], "max-routes-per-client") && p[1] && !p[2])
{
VERIFY_PERMISSION(OPT_P_INHERI= T);
- options-&g= t;max_routes_per_client =3D max_int(atoi(p[1]), 1);
+ options->max_routes_per_client= =3D max_int(positive_atoi(p[1], msglevel), 1);
}
else if (streq(p[0], "client-cert-not-required")= && !p[1])
{
@@ -7629,14 +7661= ,14 @@
{
VERIFY_PERMISSION(OP= T_P_GENERAL);
options->auth_token_generate =3D = true;
- options-= >auth_token_lifetime =3D p[1] ? positive_atoi(p[1]) : 0;
+ options->auth_token_life= time =3D p[1] ? positive_atoi(p[1], msglevel) : 0;

=
for (int i =3D 2; i < MAX_PARMS && p[i] !=3D = NULL; i++)
{
/* the s= econd parameter can be the renewal time */
- if (i =3D=3D 2 && positive_atoi(p[= i]))
+ if = (i =3D=3D 2 && positive_atoi(p[i], msglevel))
= {
- = options->auth_token_renewal =3D positive_atoi(p[i]);
+ options->auth_to= ken_renewal =3D positive_atoi(p[i], msglevel);

= }
else if (streq(p[i], "external-auth&qu= ot;))
{
@@ -7716,7 +7748,7 @@<= /span>
int n_bcast_buf;

VERIFY_PERMISSION(OPT_P_GENERAL);

- n_bcast_buf =3D atoi(p[1]);
+ n_bcast_buf =3D atoi_warn(p[1= ], msglevel);
if (n_bcast_buf < 1)
{

msg(msglevel, "--bcast-buf= fers parameter must be > 0");
@@ -7728,7 +7760,7 @@=
int tcp_queue_limit;

= VERIFY_PERMISSION(OPT_P_GENERAL);
- tcp_queue_limit =3D atoi(p[1]);+ tcp_queue_limit =3D = atoi_warn(p[1], msglevel);
if (tcp_queue_limit <= ; 1)
{
msg(msglevel, = "--tcp-queue-limit parameter must be > 0");
@@= -7876,10 +7908,10 @@
int ageing_time, check_inter= val;

VERIFY_PERMISSION(OPT_P_GEN= ERAL);
- ageing_= time =3D atoi(p[1]);
= + ageing_time =3D atoi_warn(p[1], msglevel);
= if (p[2])
{
- check_interval =3D atoi(p[2]);
+ check_interval =3D atoi= _warn(p[1], msglevel);
}
= else
{
@@ -7908,7 +7940,7 @@

else if (streq(p[0], "push-continuation") &&a= mp; p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_PULL_MODE);
- options->push_continuation =3D atoi(p[1]);<= br>+ options->push_co= ntinuation =3D atoi_warn(p[1], msglevel);
}
= else if (streq(p[0], "auth-user-pass") && !p[2= ])
{
@@ -7933,7 +7965,7 @@
<= span> {
VERIFY_PERMISSION(OPT_P_GENERAL);
options->sc_info.challenge_text =3D p[1];- if (atoi(p[2]))<= br>+ if (atoi_warn(p[1],= msglevel))
{
options= ->sc_info.flags |=3D SC_ECHO;
}
@@ -8029,7 +8061,7 @@

{
= if (!streq(p[2], "default"))
= {
- = int offset =3D atoi(p[2]);
+ int offset =3D options_atoi(p[1], msgle= vel);

if (!(offset &= gt; -256 && offset < 256))
= {
@@ -8045,7 +8077,7 @@
{<= /span>
const int min_lease =3D 30;
= int lease_time;
- lease_time =3D atoi(p[3]);<= br>+ lease_t= ime =3D options_atoi(p[1], msglevel);
= if (lease_time < min_lease)
{
msg(msglevel, "--ip-win32 dynamic = [offset] [lease-time]: lease time parameter (%d) must be at least %d second= s", lease_time, min_lease);
@@ -8169,7 +8201,7 @@
else if (streq(p[1], "NBT") && p[2] = && !p[3])
{
i= nt t;
- t = =3D atoi(p[2]);
+ = t =3D options_atoi(p[1], msglevel);
if= (!(t =3D=3D 1 || t =3D=3D 2 || t =3D=3D 4 || t =3D=3D 8))
= {
msg(msglevel, "--dhcp-= option NBT: parameter (%d) must be 1, 2, 4, or 8", t);
@@ -8227,7 +8259,7 @@

#if defined(TARGET_ANDROID)<= br> else if (streq(p[1], "PROXY_HTTP") && p= [3] && !p[4])
{
- o->http_proxy_port =3D atoi(p[3])= ;
+ o->= http_proxy_port =3D options_atoi(p[1], msglevel);
= o->http_proxy =3D p[2];
}
= #endif
@@ -8261,7 +8293,7 @@
{<= br> int s;
VERIFY_PERMISSION(OPT_P_D= HCPDNS);
- s =3D= atoi(p[1]);
+ = s =3D options_atoi(p[1], msglevel);
if (s < 0 = || s >=3D 256)
{
m= sg(msglevel, "--tap-sleep parameter must be between 0 and 255");<= /span>
@@ -8344,7 +8376,7 @@
options->= exit_event_name =3D p[1];
if (p[2])
{

- = options->exit_event_initial_state =3D (atoi(p[2]) !=3D 0);
= + options->exit_e= vent_initial_state =3D (options_atoi(p[1], msglevel) !=3D 0);
}

}
else if (streq(p[= 0], "allow-nonadmin") && !p[2])
@@ -8711,= 7 +8743,7 @@
{
int re= play_window;

- replay_window =3D atoi(p[1]);
+ replay_window =3D atoi_warn(p[1]= , msglevel);
if (!(MIN_SEQ_BACKTRACK <=3D r= eplay_window && replay_window <=3D MAX_SEQ_BACKTRACK)) {
msg(msglevel, "= replay-window window size parameter (%d) must be between %d and %d",
@@ -8726,7 +8758,7 @@
{<= br> int replay_time;

- replay_time =3D atoi= (p[2]);

+ = replay_time =3D atoi_warn(p[1], msglevel);
= if (!(MIN_TIME_BACKTRACK <=3D replay_time && replay_time &l= t;=3D MAX_TIME_BACKTRACK))
{
msg(msglevel, "replay-window time window param= eter (%d) must be between %d and %d",

@@ -9168,7 +9200= ,7 @@
else if (streq(p[0], "tls-timeout") &a= mp;& p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_TLS_PARMS);
- options->tls_timeout =3D positive_atoi(p[1]);=
+ options->= ;tls_timeout =3D positive_atoi(p[1], msglevel);
}
else if (streq(p[0], "reneg-bytes") && p= [1] && !p[2])
{
@@ -9197,21 +9= 229,21 @@
else if (streq(p[0], "reneg-sec") = && p[1] && !p[3])
{
= VERIFY_PERMISSION(OPT_P_TLS_PARMS);
- options->renegotiate_seconds =3D positive_a= toi(p[1]);
+ o= ptions->renegotiate_seconds =3D positive_atoi(p[1], msglevel); if (p[2])
{
- options->renegotiate_seconds= _min =3D positive_atoi(p[2]);
+ options->renegotiate_seconds_min =3D positive_atoi= (p[2], msglevel);
}
}<= br> else if (streq(p[0], "hand-window") && p[1]= && !p[2])
{
VERIFY_P= ERMISSION(OPT_P_TLS_PARMS);
- options->handshake_window =3D positive_atoi(p[1]);<= br>+ options->handsha= ke_window =3D positive_atoi(p[1], msglevel);
}<= br> else if (streq(p[0], "tran-window") && p[1]= && !p[2])
{
VERIFY_P= ERMISSION(OPT_P_TLS_PARMS);
- options->transition_window =3D positive_atoi(p[1]);=
+ options->transi= tion_window =3D positive_atoi(p[1], msglevel);
}
else if (streq(p[0], "tls-auth") && p[1] = && !p[3])
{
@@ -9348,7 +9380,7= @@
else if (streq(p[0], "show-pkcs11-ids") = && !p[3])
{
char *pro= vider =3D p[1];
- = bool cert_private =3D (p[2] =3D=3D NULL ? false : ( atoi(p[2]) !=3D 0 ))= ;
+ bool cert_= private =3D (p[2] =3D=3D NULL ? false : (atoi_warn(p[1], msglevel) !=3D 0 )= );

#ifdef DEFAULT_PKCS11_MODULE if (!provider)
@@ -9400,7 +9432,7 @@

for (j =3D 1; j < MAX_PARMS &&= amp; p[j] !=3D NULL; ++j)
{
- options->pkcs11_protected_au= thentication[j-1] =3D atoi(p[j]) !=3D 0 ? 1 : 0;
+ options->pkcs11_protected_authe= ntication[j-1] =3D atoi_warn(p[j], msglevel) !=3D 0 ? 1 : 0;
}

}
else if (streq(p[0= ], "pkcs11-private-mode") && p[1])
@@ -94= 22,13 +9454,13 @@

for (j =3D 1; = j < MAX_PARMS && p[j] !=3D NULL; ++j)
{=
- options-&= gt;pkcs11_cert_private[j-1] =3D atoi(p[j]) !=3D 0 ? 1 : 0;
+ options->pkcs11_cert_= private[j-1] =3D atoi_warn(p[j], msglevel) !=3D 0 ? 1 : 0;
= }
}
else if (streq(p[0],= "pkcs11-pin-cache") && p[1] && !p[2])
= {
VERIFY_PERMISSION(OPT_P_GENERAL);
- options->pkcs1= 1_pin_cache_period =3D atoi(p[1]);
+ options->pkcs11_pin_cache_period =3D atoi_warn(p[= 1], msglevel);
}
else if (streq(p= [0], "pkcs11-id") && p[1] && !p[2])
{

@@ -9457,12 +9489,12 @@
{
VERIFY_PERMISSION(OPT_P_PEER_ID);
= options->use_peer_id =3D true;
- options->peer_id =3D atoi(p[1]);
+ options->peer_id =3D = atoi_warn(p[1], msglevel);

}
#ifdef H= AVE_EXPORT_KEYING_MATERIAL
else if (streq(p[0], "= keying-material-exporter") && p[1] && p[2])
= {
- i= nt ekm_length =3D positive_atoi(p[2]);
+ int ekm_length =3D positive_atoi(p[2], msglevel)= ;

VERIFY_PERMISSION(OPT_P_GENERA= L);

@@ -9521,7 +9553,7 @@
else if (streq(p[0], "vlan-pvid") && p[1] &&= ; !p[2])

{
VERIFY_PERMISSION(= OPT_P_GENERAL|OPT_P_INSTANCE);
- options->vlan_pvid =3D positive_atoi(p[1]);
<= span style=3D"color: hsl(120, 100%, 40%);">+ options->vlan_pvid = =3D positive_atoi(p[1], msglevel);

if (options->= ;vlan_pvid < OPENVPN_8021Q_MIN_VID
|| optio= ns->vlan_pvid > OPENVPN_8021Q_MAX_VID)
{

To view, visit change 873. To unsubscribe, or f= or help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie1e2eb54d516b3ae87c5ca56fe8= edd77ee2be4de
Gerrit-Change-Number: 873
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--ias9IyC0Ql8=--