From: "plaisthos (Code Review)" Date: Wed, 22 Jan 2025 13:28:22 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <64f693ed7f7eeebec3f14599f987fbc38d25b8c0-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="2OOYqqyZi4w="; 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 --2OOYqqyZi4w= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello flichtenheld, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/873?usp=3Demail to look at the new patch set (#3). 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/3 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 93b8417..c999f84 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 !=3D '\0' || 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 !=3D '\0' || 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); 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; 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 atoi_warn(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 atoi_warn(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 atoi_warn(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 atoi_warn(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 atoi_warn(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 (atoi_warn(p[1], msgleve= l) !=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: 3 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newpatchset --2OOYqqyZi4w= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

plaisthos uploaded patch set #3 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/873?usp=3Demail">View Chang= e

Print warnings/errors when numerical parameters cannot be parsed
<= br>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 0if the string cannot be parsed. This is lead to unexpected results.
Change the behaviour by printing a warning in these cases instead. Whenparsing a configuration, these warnings will error out since the msglevel<= br>is M_USAGE in this case. Example:

./src/openvpn/openvpn --res= olv-retry 198jj
Options error: Cannot parse argument '198jj'= as non-negative integer

Reported-By: Anqi Chen <chen.anqi3@...2825...= 55...>
Reported-By: Cristina Nita-Rotaru <c.nitarotaru@...2855...&= gt;
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=
/3
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 93b8417..c999f84 100644
--- a/src/openvpn/= options.c
+++ b/src/openvpn/options.c
@@ -4= 926,11 +4926,43 @@
}
#endif

+/**
<= span style=3D"color: hsl(120, 100%, 40%);">+ * Converts a str to a positive= number if the string represents a postive
+ * integer number. Otherwise print a warning with ms= glevel and return 0
+= */
static int
-positive_atoi(const char *str)
+positive_atoi(const char *str, int msglevel) {
- const in= t i =3D atoi(str);
- = return i < 0 ? 0 : i;
+ char *endptr;
+ long long i =3D strtoll(str, &endptr, 10);
+
+ if (i < 0 || *endptr !=3D '\0' || i > INT= _MAX)
+ {+ msg(msglevel, "= Cannot parse argument '%s' as non-negative integer",+ str);
<= span style=3D"color: hsl(120, 100%, 40%);">+ 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)<= /span>
+{
+ char *endptr;
+ long long i =3D strtoll(str, &en= dptr, 10);
++ if (i < INT_MIN || *e= ndptr !=3D '\0' || i > INT_MAX)
+ {
+ msg(msglevel, "Cannot parse argument '%s' as = integer", str);
= + i =3D 0;
+ = }
+
+ return (int) i;

}

#ifdef _WIN32 /* This function is o= nly 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 i= s out of range");
@@ -6250,7 +6282,7 @@
}
else
{
- options->res= olve_retry_seconds =3D positive_atoi(p[1]);
+ options->resolve_retry_seconds =3D p= ositive_atoi(p[1], msglevel);
}
= }
else if ((streq(p[0], "preresolve") || = streq(p[0], "ip-remote-hint")) && !p[2])
= @@ -6267,7 +6299,7 @@
else if (streq(p[0], "conne= ct-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 avoi= d

* overflow when scaled up for exponential backo= ff
@@ -6282,19 +6314,19 @@
if (p[2= ])
{
options->ce.c= onnect_retry_seconds_max =3D
- max_int(positive_atoi(p[2]), options->ce.connect_= retry_seconds);
+ = max_int(positive_atoi(p[2], msglevel), options->ce.connect_r= etry_seconds);
}
}
= else if ((streq(p[0], "connect-timeout") || streq(p[0]= , "server-poll-timeout"))
&&= ; p[1] && !p[2])
{
VE= RIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION);
- options->ce.connect_timeout =3D posit= ive_atoi(p[1]);
+ = options->ce.connect_timeout =3D positive_atoi(p[1], msglevel);
}
else if (streq(p[0], "connect-r= etry-max") && p[1] && !p[2])
{
VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION);
- options->con= nect_retry_max =3D positive_atoi(p[1]);
+ options->connect_retry_max =3D positive_atoi= (p[1], msglevel);
}
else if (stre= q(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 pos= itive_atoi(p[1]);

+ = options->gremlin =3D positive_atoi(p[1], msglevel);
}

#endif
else if (streq(p[0], = "chroot") && p[1] && !p[2])
@@ -6= 449,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-&g= t;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(OP= T_P_MESSAGES);
- = options->mute =3D positive_atoi(p[1]);
+ options->mute =3D positive_atoi(p[1], msg= level);
}
else if (streq(p[0], &q= uot;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_updat= e_freq =3D positive_atoi(p[2], msglevel);
}=
}
else if (streq(p[0], "status-ver= sion") && p[1] && !p[2])
@@ -6489,7 +6= 521,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,1= 7 @@
else if ((streq(p[0], "link-mtu") || st= req(p[0], "udp-mtu")) && p[1] && !p[2]) {
VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CO= NNECTION);
- opt= ions->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_CONNECTI= ON);
- options-&= gt;ce.tun_mtu =3D positive_atoi(p[1]);
+ options->ce.tun_mtu =3D positive_atoi(p[1], m= sglevel);
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 i= f (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, "--tu= n-mtu-max value '%s' is invalid", p[1]);
@@ -6= 550,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], ms= glevel);
options->ce.tun_mtu_extra_defined =3D = true;
}
else if (streq(p[0], &quo= t;max-packet-size") && p[1] && !p[2])
= {
VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTIO= N);
- 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);


if (= maxmtu < TLS_CHANNEL_MTU_MIN || maxmtu > TLS_CHANNEL_BUF_SIZE)=
@@ -6582,7 +6614,7 @@
else if (streq(p[0], &= quot;fragment") && p[1] && !p[3])
= {
VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION);<= /span>
- options->ce= .fragment =3D positive_atoi(p[1]);
+ options->ce.fragment =3D positive_atoi(p[1], msgl= evel);

if (options->ce.fragme= nt < 68)
{
@@ -6613,23 +6645,23= @@
else if (streq(p[0], "nice") && = p[1] && !p[2])
{
VERI= FY_PERMISSION(OPT_P_NICE);
- options->nice =3D atoi(p[1]);
+ options->nice =3D atoi_warn(p[1], msgl= evel);
}
else if (streq(p[0], &qu= ot;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])
{
VER= IFY_PERMISSION(OPT_P_SOCKBUF);
- options->sndbuf =3D positive_atoi(p[1]);
+ options->sndbuf =3D pos= itive_atoi(p[1], msglevel);

}
els= e if (streq(p[0], "mark") && p[1] && !p[2])
{
#if defined(TARGET_LINUX) && HAV= E_DECL_SO_MARK
VERIFY_PERMISSION(OPT_P_GENERAL);
- options->mar= k =3D atoi(p[1]);
+ = options->mark =3D atoi_warn(p[1], msglevel);
#end= if
}
else if (streq(p[0], "s= ocket-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], msglevel);
#else

msg(msglevel, "--txqueuelen not sup= ported 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 (stre= q(p[0], "inactive") && p[1] && !p[3])
<= span> {
VERIFY_PERMISSION(OPT_P_TIMER);=
- options->inactivi= ty_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], "sess= ion-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&= quot;) && p[1] && !p[2])
{
<= span>@@ -6903,24 +6935,24 @@

else if (streq(p[0], &quo= t;keepalive") && p[1] && p[2] && !p[3])=
{
VERIFY_PERMISSION(OPT_P_GENERAL);=
- options->k= eepalive_ping =3D atoi(p[1]);
- options->keepalive_timeout =3D atoi(p[2]);
+ options->keepalive_pin= g =3D atoi_warn(p[1], msglevel);
+ options->keepalive_timeout =3D atoi_warn(p[1], msgl= evel);
}
else if (streq(p[0], &qu= ot;ping") && p[1] && !p[2])
{

VERIFY_PERMISSION(OPT_P_TIMER);
- options->ping_send_timeout =3D p= ositive_atoi(p[1]);
+= options->ping_send_timeout =3D positive_atoi(p[1], msglevel);
}
else if (streq(p[0], "ping-e= xit") && p[1] && !p[2])
{<= br> VERIFY_PERMISSION(OPT_P_TIMER);
- options->ping_rec_timeout =3D positi= ve_atoi(p[1]);
+ = options->ping_rec_timeout =3D positive_atoi(p[1], msglevel); options->ping_rec_timeout_action =3D PING_EXIT;<= br> }
else if (streq(p[0], "ping-restar= t") && 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 @@<= br> VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION|OPT_P_EX= PLICIT_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], "r= oute-metric") && p[1] && !p[2])
{=
VERIFY_PERMISSION(OPT_P_ROUTE);
- options->route_default_metri= c =3D positive_atoi(p[1]);
+ options->route_default_metric =3D positive_atoi(p[1], msg= level);
}
else if (streq(p[0], &q= uot;route-delay") && !p[3])
{
<= span>@@ -7061,10 +7093,10 @@
options->route_del= ay_defined =3D true;
if (p[1])
= {
- op= tions->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]);<= br>+ options->= ;route_delay_window =3D positive_atoi(p[2], msglevel);
= }
}
else<= br>@@ -7229,7 +7261,7 @@
}
= else if (streq(p[1], "SERVER_POLL_TIMEOUT") && p[= 2])
{
- options->ce.connect_timeout =3D positive_atoi(p[2])= ;
+ option= s->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])
<= span> {
VERIFY_PERMISSION(OPT_P_GENERAL);

- script_security_se= t(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], msgleve= l);
/* can be 0, but otherwise it needs to be = high enough so we can
* substract room for he= aders. */
if (mssfix !=3D 0
@@= -7451,7 +7483,7 @@
options->ifconfig_pool_pers= ist_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);
- r= eal =3D atoi(p[1]);
- = virtual =3D atoi(p[2]);
+ real =3D atoi_warn(p[1], msglevel);
+ virtual =3D atoi_warn(p[1], msgle= vel);
if (real < 1 || virtual < 1) {
msg(msglevel, "--hash-s= ize sizes must be >=3D 1 (preferably a power of 2)");
@@ -7498,8 +7530,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);
+ cf_per =3D atoi_warn(p[1], msglevel);<= br> if (cf_max < 0 || cf_per < 0)
= {
msg(msglevel, "--connect-freq parms= must be > 0");
@@ -7529,7 +7561,7 @@
int max_clients;


VER= IFY_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] &a= mp;& !p[2])
{
VERIFY_PERM= ISSION(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], msglevel), 1);
= }
else if (streq(p[0], "client-cert-no= t-required") && !p[1])
{
= @@ -7629,14 +7661,14 @@
{
VER= IFY_PERMISSION(OPT_P_GENERAL);
options->auth_to= ken_generate =3D true;
= - options->auth_token_lifetime =3D p[1] ? positive_atoi(p[1]) : 0= ;
+ options-&g= t;auth_token_lifetime =3D p[1] ? positive_atoi(p[1], msglevel) : 0;<= br>
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])= ;
+ op= tions->auth_token_renewal =3D positive_atoi(p[i], msglevel);
<= span> }

else if (streq(p[i], "= ;external-auth"))
{
@@ -7= 716,7 +7748,7 @@
int n_bcast_buf;
=
VERIFY_PERMISSION(OPT_P_GENERAL);
- n_bcast_buf =3D atoi(p[1]);<= /span>
+ 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;
<= span>

VERIFY_PERMISSION(OPT_P_GENERAL);- tcp_queue_limit =3D ato= i(p[1]);
+ tcp= _queue_limit =3D atoi_warn(p[1], msglevel);
if (tc= p_queue_limit < 1)
{
= msg(msglevel, "--tcp-queue-limit parameter must be > 0");
@@ -7876,10 +7908,10 @@
int ageing_= time, check_interval;

VERIFY_PER= MISSION(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-continuati= on") && p[1] && !p[2])
{ VERIFY_PERMISSION(OPT_P_PULL_MODE);
- options->push_continuation =3D a= toi(p[1]);
+ o= ptions->push_continuation =3D atoi_warn(p[1], msglevel);
}

else if (streq(p[0], "auth-user-pass"= ;) && !p[2])
{
@@ -7933,7 +796= 5,7 @@
{
VERIFY_PERMISSION(OP= T_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 atoi_= warn(p[1], msglevel);

= if (!(offset > -256 && offset < 256))
= {
@@ -8045,7 +8077,7 @@
= {
const int min_lease = =3D 30;
int lease_time;
- lease_time =3D a= toi(p[3]);

+ = lease_time =3D atoi_warn(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") &= amp;& p[2] && !p[3])
{
int t;

- = t =3D atoi(p[2]);
+ t =3D atoi_warn(p[1], msglevel);
= if (!(t =3D=3D 1 || t =3D=3D 2 || t =3D=3D 4 || t =3D=3D 8))=
{
msg(msglevel, &qu= ot;--dhcp-option NBT: parameter (%d) must be 1, 2, 4, or 8", t);
@@ -8227,7 +8259,7 @@
#if defined(TARGET_ANDROI= D)
else if (streq(p[1], "PROXY_HTTP") &a= mp;& p[3] && !p[4])
{
- o->http_proxy_port =3D = atoi(p[3]);
+ = o->http_proxy_port =3D atoi_warn(p[1], msglevel);
= o->http_proxy =3D p[2];
}
= #endif
@@ -8261,7 +8293,7 @@
{<= /span>
int s;
VERIFY_PERMISSION(= OPT_P_DHCPDNS);
- = s =3D atoi(p[1]);
+= s =3D atoi_warn(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->ex= it_event_initial_state =3D (atoi_warn(p[1], msglevel) !=3D 0);
}

}
else if (streq(p= [0], "allow-nonadmin") && !p[2])
@@ -8711= ,7 +8743,7 @@
{
int r= eplay_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, &= quot;replay-window window size parameter (%d) must be between %d and %d&quo= t;,
@@ -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_ti= me <=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]);
+ option= s->tls_timeout =3D positive_atoi(p[1], msglevel);
}=
else if (streq(p[0], "reneg-bytes") &&a= mp; p[1] && !p[2])
{
@@ -9197,= 21 +9229,21 @@
else if (streq(p[0], "reneg-sec&qu= ot;) && p[1] && !p[3])
{
VERIFY_PERMISSION(OPT_P_TLS_PARMS);

- options->renegotiate_seconds =3D posit= ive_atoi(p[1]);
+ = options->renegotiate_seconds =3D positive_atoi(p[1], msglevel);
if (p[2])
{
- options->renegotiate_sec= onds_min =3D positive_atoi(p[2]);
+ options->renegotiate_seconds_min =3D positive_= atoi(p[2], msglevel);
}
}
else if (streq(p[0], "hand-window") && = p[1] && !p[2])
{
VERI= FY_PERMISSION(OPT_P_TLS_PARMS);
- options->handshake_window =3D positive_atoi(p[1]);
+ options->han= dshake_window =3D positive_atoi(p[1], msglevel);
}
else if (streq(p[0], "tran-window") && = p[1] && !p[2])
{
VERI= FY_PERMISSION(OPT_P_TLS_PARMS);
- options->transition_window =3D positive_atoi(p[1]);
+ options->tr= ansition_window =3D positive_atoi(p[1], msglevel);
}
else if (streq(p[0], "tls-auth") && p= [1] && !p[3])
{
@@ -9348,7 +93= 80,7 @@
else if (streq(p[0], "show-pkcs11-ids&quo= t;) && !p[3])
{
char = *provider =3D p[1];
- = bool cert_private =3D (p[2] =3D=3D NULL ? false : ( atoi(p[2]) !=3D = 0 ));
+ bool c= ert_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 &a= mp;& 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 (stre= q(p[0], "pkcs11-private-mode") && p[1])
@= @ -9422,13 +9454,13 @@

for (j = =3D 1; j < MAX_PARMS && p[j] !=3D NULL; ++j)
= {
- op= tions->pkcs11_cert_private[j-1] =3D atoi(p[j]) !=3D 0 ? 1 : 0;+ options->pkcs1= 1_cert_private[j-1] =3D atoi_warn(p[j], msglevel) !=3D 0 ? 1 : 0; }
}
else if (stre= q(p[0], "pkcs11-pin-cache") && p[1] && !p[2])
{
VERIFY_PERMISSION(OPT_P_GENERA= L);
- options-&g= t;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);
<= span> 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], ms= glevel);

VERIFY_PERMISSION(OPT_P= _GENERAL);

@@ -9521,7 +9553,7 @@ else if (streq(p[0], "vlan-pvid") && p[1] &a= mp;& !p[2])
{
VERIFY_PERM= ISSION(OPT_P_GENERAL|OPT_P_INSTANCE);
- options->vlan_pvid =3D positive_atoi(p[1]);
+ options->vlan= _pvid =3D positive_atoi(p[1], msglevel);
if (optio= ns->vlan_pvid < OPENVPN_8021Q_MIN_VID
||= options->vlan_pvid > OPENVPN_8021Q_MAX_VID)
= {

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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie1e2eb54d516b3ae87c5ca56fe8= edd77ee2be4de
Gerrit-Change-Number: 873
Gerrit-PatchSet: 3
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: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-MessageType: newpatchset
--2OOYqqyZi4w=--