From: "plaisthos (Code Review)" Date: Mon, 27 Jan 2025 12:01:41 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., gert@...1296... Message-ID: <7800acb498a73820a96e49bc0b74057afcd87920-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="XHJ8uaMC1mo="; 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: cron2 , flichtenheld Cc: openvpn-devel --XHJ8uaMC1mo= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, plaisthos. Hello cron2, 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 (#7). The following approvals got outdated and were removed: Code-Review+2 by cron2 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 Signed-off-by: Arne Schwabe --- M src/openvpn/options.c M src/openvpn/options_util.c M src/openvpn/options_util.h 3 files changed, 144 insertions(+), 82 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/73/873/7 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index bd5c056..4510bea 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -60,6 +60,8 @@ #include "platform.h" #include "xkey_common.h" #include "dco.h" +#include "options_util.h" + #include #include "memdbg.h" @@ -5014,13 +5016,6 @@ } #endif -static int -positive_atoi(const char *str) -{ - const int i =3D atoi(str); - return i < 0 ? 0 : i; -} - #ifdef _WIN32 /* This function is only used when compiling on Windows */ static unsigned int atou(const char *str) @@ -6043,7 +6038,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"); @@ -6355,7 +6350,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]) @@ -6372,7 +6367,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 @@ -6387,19 +6382,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]) { @@ -6422,7 +6417,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]) @@ -6554,7 +6549,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 @@ -6573,7 +6568,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]) { @@ -6586,7 +6581,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]) @@ -6594,7 +6589,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"); @@ -6622,17 +6617,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 { @@ -6642,7 +6637,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]); @@ -6655,13 +6650,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) @@ -6687,7 +6682,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) { @@ -6718,23 +6713,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")) @@ -6764,7 +6759,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; @@ -6775,7 +6770,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", @@ -6823,7 +6818,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]); @@ -6841,7 +6836,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]) { @@ -7008,24 +7003,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[2], 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]) @@ -7038,7 +7033,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 { @@ -7158,7 +7153,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]) { @@ -7166,10 +7161,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 @@ -7334,7 +7329,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 { @@ -7366,14 +7361,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 @@ -7556,7 +7551,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]) @@ -7588,8 +7583,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[2], msglevel); if (real < 1 || virtual < 1) { msg(msglevel, "--hash-size sizes must be >=3D 1 (preferably a = power of 2)"); @@ -7603,8 +7598,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[2], msglevel); if (cf_max < 0 || cf_per < 0) { msg(msglevel, "--connect-freq parms must be > 0"); @@ -7634,7 +7629,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"); @@ -7650,7 +7645,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]) { @@ -7734,14 +7729,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 && valid_integer(p[i], true)) { - 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")) { @@ -7821,7 +7816,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"); @@ -7833,7 +7828,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"); @@ -7964,10 +7959,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[2], msglevel); } else { @@ -7996,7 +7991,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]) { @@ -8021,7 +8016,7 @@ { VERIFY_PERMISSION(OPT_P_GENERAL); options->sc_info.challenge_text =3D p[1]; - if (atoi(p[2])) + if (atoi_warn(p[2], msglevel)) { options->sc_info.flags |=3D SC_ECHO; } @@ -8117,7 +8112,7 @@ { if (!streq(p[2], "default")) { - int offset =3D atoi(p[2]); + int offset =3D atoi_warn(p[2], msglevel); if (!(offset > -256 && offset < 256)) { @@ -8133,7 +8128,7 @@ { const int min_lease =3D 30; int lease_time; - lease_time =3D atoi(p[3]); + lease_time =3D atoi_warn(p[3], 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); @@ -8257,7 +8252,7 @@ else if (streq(p[1], "NBT") && p[2] && !p[3]) { int t; - t =3D atoi(p[2]); + t =3D atoi_warn(p[2], 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); @@ -8315,7 +8310,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 positiove_atoi(p[3], msglevel); o->http_proxy =3D p[2]; } #endif @@ -8349,7 +8344,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= "); @@ -8432,7 +8427,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[2], msgleve= l) !=3D 0); } } else if (streq(p[0], "allow-nonadmin") && !p[2]) @@ -8799,7 +8794,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", @@ -8814,7 +8809,7 @@ { int replay_time; - replay_time =3D atoi(p[2]); + replay_time =3D atoi_warn(p[2], 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", @@ -9256,7 +9251,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]) { @@ -9285,21 +9280,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]) { @@ -9436,7 +9431,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[2],= msglevel) !=3D 0 )); #ifdef DEFAULT_PKCS11_MODULE if (!provider) @@ -9488,7 +9483,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]) @@ -9510,13 +9505,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 (bool) (atoi_warn(p[j], = msglevel)); } } 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]) { @@ -9545,12 +9540,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); @@ -9609,7 +9604,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) { diff --git a/src/openvpn/options_util.c b/src/openvpn/options_util.c index a9e020a..fea4c3d 100644 --- a/src/openvpn/options_util.c +++ b/src/openvpn/options_util.c @@ -98,3 +98,50 @@ gc_free(&gc); return message; } + +bool +valid_integer(const char *str, bool positive) +{ + char *endptr; + long long i =3D strtoll(str, &endptr, 10); + + if (i < INT_MIN || (positive && i < 0) || *endptr !=3D '\0' || i > INT= _MAX) + { + return false; + } + else + { + return true; + } +} + +int +positive_atoi(const char *str, int msglevel) +{ + 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; +} + +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; +} diff --git a/src/openvpn/options_util.h b/src/openvpn/options_util.h index 29bc9dc..f34d997 100644 --- a/src/openvpn/options_util.h +++ b/src/openvpn/options_util.h @@ -30,4 +30,24 @@ const char * parse_auth_failed_temp(struct options *o, const char *reason); -#endif + +/** Checks if the string is a valid integer by checking if it can be + * converted to an integer */ +bool +valid_integer(const char *str, bool positive); + +/** + * Converts a str to a positive number if the string represents a postive + * integer number. Otherwise print a warning with msglevel and return 0 + */ +int +positive_atoi(const char *str, int msglevel); + +/** + * 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 + */ +int +atoi_warn(const char *str, int msglevel); + +#endif /* ifndef OPTIONS_UTIL_H_ */ -- 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: 7 Gerrit-Owner: plaisthos Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-MessageType: newpatchset --XHJ8uaMC1mo= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2, plaisthos.

plaisthos uploaded patch set #7 to this change.

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

The following approvals got outdated and were removed: Code-Review+2 by cron2

Print warnings/errors when numerical parameters cann=
ot be parsed

Using the atoi method is a best effort method that pars= es as much of the
input string as possible as integer and ignores the re= st or return 0
if the string cannot be parsed. This is lead to unexpecte= d results.

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

./src/open= vpn/openvpn --resolv-retry 198jj
Options error: Cannot parse argumen= t '198jj' as non-negative integer

Reported-By: Anqi Chen <= ;chen.anqi3@...2855...>
Reported-By: Cristina Nita-Rotaru <c.nitar= otaru@...2855...>
Change-Id: Ie1e2eb54d516b3ae87c5ca56fe8edd77ee2be4d= e
Signed-off-by: Arne Schwabe <arne@...1227...>
---
M src/op= envpn/options.c
M src/openvpn/options_util.c
M src/openvpn/options_ut= il.h
3 files changed, 144 insertions(+), 82 deletions(-)

git p= ull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/73/873/7
di=
ff --git a/src/openvpn/options.c b/src/openvpn/options.c
in= dex bd5c056..4510bea 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -60,6 +60,8 @@<= /span>
#include "platform.h"
#include = "xkey_common.h"
#include "dco.h"
+#include "options_ut= il.h"
+ #include <ctype.h>

#inclu= de "memdbg.h"
@@ -5014,13 +5016,6 @@
}

#endif

-static int
-positive_atoi(const char *str)
-{
- const int i =3D atoi(str);
- return i < 0 ? 0 : i;
-}
= -
#ifdef _WIN32 /* This function is only used when compil= ing on Windows */
static unsigned int
ato= u(const char *str)
@@ -6043,7 +6038,7 @@
= int cache;

VERIFY_PERMISS= ION(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 range"= ;);
@@ -6355,7 +6350,7 @@
}=
else
{
- options->resolve_retry_seconds = =3D positive_atoi(p[1]);
+ options->resolve_retry_seconds =3D positive_atoi(p[1], = msglevel);
}
}
else if ((streq(p[0], "preresolve") || streq(p[0], "i= p-remote-hint")) && !p[2])

@@ -6372,7 +6367,7 = @@
else if (streq(p[0], "connect-retry") &am= p;& p[1] && !p[3])
{
= VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION);
- options->ce.connect_retry_secon= ds =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
= @@ -6387,19 +6382,19 @@
if (p[2])
= {
options->ce.connect_retry_second= s_max =3D
- = max_int(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"))
&& 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") &am= p;& 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], "ipcha= nge") && p[1])
{
@@ -6422= ,7 +6417,7 @@
else if (streq(p[0], "gremlin"= ) && p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_GENERAL);
- options->gremlin =3D positive_atoi(p[1]);
+ options->g= remlin =3D positive_atoi(p[1], msglevel);
}
= #endif
else if (streq(p[0], "chroot")= && p[1] && !p[2])
@@ -6554,7 +6549,7 @@
else if (streq(p[0], "verb") && p[1] &= amp;& !p[2])
{
VERIFY_PER= MISSION(OPT_P_MESSAGES);
+ options->verbosity =3D pos= itive_atoi(p[1], msglevel);
if (options->verbos= ity >=3D (D_TLS_DEBUG_MED & M_DEBUG_LEVEL))
= {
/* We pass this flag to the SSL library to = avoid
@@ -6573,7 +6568,7 @@
else if (s= treq(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-stde= rr") && !p[1])
{
@@ -6586= ,7 +6581,7 @@
options->status_file =3D p[1];
if (p[2])
{
- options->status_file_u= pdate_freq =3D positive_atoi(p[2]);

+ options->status_file_update_freq =3D positiv= e_atoi(p[2], msglevel);
}
}
else if (streq(p[0], "status-version") &&= amp; p[1] && !p[2])
@@ -6594,7 +6589,7 @@ int version;

VER= IFY_PERMISSION(OPT_P_GENERAL);
- version =3D atoi(p[1]);
+ version =3D atoi_warn(p[1], msglevel);<= br> if (version < 1 || version > 3)
= {
msg(msglevel, "--status-version m= ust be 1 to 3");
@@ -6622,17 +6617,17 @@
else if ((streq(p[0], "link-mtu") || streq(p[0], "ud= p-mtu")) && p[1] && !p[2])

{
VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION);<= br>- options->ce.link_m= tu =3D positive_atoi(p[1]);
+ options->ce.link_mtu =3D positive_atoi(p[1], msglevel);<= /span>
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
{@@ -6642,7 +6637,7 @@
else if (streq(p[0], &qu= ot;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 &= #39;%s' is invalid", p[1]);
@@ -6655,13 +6650,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 positi= ve_atoi(p[1]);
+ = options->ce.tun_mtu_extra =3D positive_atoi(p[1], msglevel); options->ce.tun_mtu_extra_defined =3D true;
<= span> }

else if (streq(p[0], "max-packet-size= ") && p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION);
- int maxmtu =3D positive_ato= i(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_C= HANNEL_MTU_MIN || maxmtu > TLS_CHANNEL_BUF_SIZE)
@@ -668= 7,7 +6682,7 @@
else if (streq(p[0], "fragment&quo= t;) && p[1] && !p[3])
{
VERIFY_PERMISSION(OPT_P_MTU|OPT_P_CONNECTION);

- options->ce.fragment =3D pos= itive_atoi(p[1]);
+ = options->ce.fragment =3D positive_atoi(p[1], msglevel);
=
if (options->ce.fragment < 68)
{
@@ -6718,23 +6713,23 @@
else if (streq(p[0], "nice") && p[1] && != p[2])

{
VERIFY_PERMISSION(OPT= _P_NICE);
- opti= ons->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->rcvb= uf =3D positive_atoi(p[1], msglevel);
}
else if (streq(p[0], "sndbuf") && p[1] && = !p[2])

{
VERIFY_PERMISSION(OP= T_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"= ))
@@ -6764,7 +6759,7 @@
{
<= span> VERIFY_PERMISSION(OPT_P_GENERAL);

#ifdef TAR= GET_LINUX
- opti= ons->tuntap_options.txqueuelen =3D positive_atoi(p[1]);
+ options->tuntap_options.t= xqueuelen =3D positive_atoi(p[1], msglevel);
#else<= br> msg(msglevel, "--txqueuelen not supported on this OS= ");
goto err;
@@ -6775,7 +677= 0,7 @@
int shaper;

VERIFY_PERMISSION(OPT_P_SHAPER);

- shaper =3D atoi(p[1]);
+ shaper =3D atoi_warn(p[1], msglev= el);
if (shaper < SHAPER_MIN || shaper > SHA= PER_MAX)
{
msg(msglev= el, "Bad shaper value, must be between %d and %d",
@@ -6823,7 +6818,7 @@

else if (streq(p[0], "ina= ctive") && 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);<= /span>
if (p[2])
{
int64_t val =3D atoll(p[2]);

@@ -6841,7 +68= 36,7 @@
else if (streq(p[0], "session-timeout&quo= t;) && p[1] && !p[2])
{
VERIFY_PERMISSION(OPT_P_TIMER);

- options->session_timeout =3D positive_atoi(= p[1]);
+ optio= ns->session_timeout =3D positive_atoi(p[1], msglevel);
= }
else if (streq(p[0], "proto") &&am= p; p[1] && !p[2])
{
@@ -7008,2= 4 +7003,24 @@
else if (streq(p[0], "keepalive&quo= t;) && 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_war= n(p[1], msglevel);
+ = options->keepalive_timeout =3D atoi_warn(p[2], msglevel);<= br> }
else if (streq(p[0], "ping")= && p[1] && !p[2])
{
= VERIFY_PERMISSION(OPT_P_TIMER);
- options->ping_send_timeout =3D positive_atoi(p= [1]);
+ option= s->ping_send_timeout =3D positive_atoi(p[1], msglevel);
= }
else if (streq(p[0], "ping-exit") &am= p;& 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->p= ing_rec_timeout =3D positive_atoi(p[1], msglevel);
= options->ping_rec_timeout_action =3D PING_RESTART;
= }
else if (streq(p[0], "ping-timer-rem") &a= mp;& !p[1])
@@ -7038,7 +7033,7 @@
= VERIFY_PERMISSION(OPT_P_GENERAL|OPT_P_CONNECTION|OPT_P_EXPLICIT_NOTIFY)= ;
if (p[1])
{
<= span style=3D"color: hsl(0, 100%, 40%);">- options->ce.explic= it_exit_notification =3D positive_atoi(p[1]);

+ options->ce.explicit_exit_notifica= tion =3D positive_atoi(p[1], msglevel);
} else
{
@@ -7158,7= +7153,7 @@
else if (streq(p[0], "route-metric&qu= ot;) && 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-dela= y") && !p[3])
{
@@ -7166,= 10 +7161,10 @@
options->route_delay_defined =3D= true;
if (p[1])
{=
- options->rout= e_delay =3D positive_atoi(p[1]);
+ options->route_delay =3D positive_atoi(p[1], ms= glevel);
if (p[2])
= {
- op= tions->route_delay_window =3D positive_atoi(p[2]);
+ options->route_delay_w= indow =3D positive_atoi(p[2], msglevel);
}

}
else
@@ -7= 334,7 +7329,7 @@
}
else i= f (streq(p[1], "SERVER_POLL_TIMEOUT") && p[2])
= {
- = options->ce.connect_timeout =3D positive_atoi(p[2]);
+ options->ce.conne= ct_timeout =3D positive_atoi(p[2], msglevel);
}

else
{
@@ -= 7366,14 +7361,14 @@
else if (streq(p[0], "script-= security") && p[1] && !p[2])
{
VERIFY_PERMISSION(OPT_P_GENERAL);
- script_security_set(atoi(p[1]));=
+ script_secu= rity_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 mssfi= x =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
@@ -7556,7 +7551= ,7 @@
options->ifconfig_pool_persist_filename = =3D p[1];
if (p[2])
{
- options->i= fconfig_pool_persist_refresh_freq =3D positive_atoi(p[2]);
+ options->ifconfig_poo= l_persist_refresh_freq =3D positive_atoi(p[2], msglevel);
= }
}
else if (streq(p[0], = "ifconfig-ipv6-pool") && p[1] && !p[2])@@ -7588,8 +7583,8 @@
int real, virtual;

VERIFY_PERMISSION(OPT_P_GENERAL);<= /span>
- real =3D atoi(= p[1]);
- virtual= =3D atoi(p[2]);
+ = real =3D atoi_warn(p[1], msglevel);
+ virtual =3D atoi_warn(p[2], msglevel);<= br> if (real < 1 || virtual < 1)
= {
msg(msglevel, "--hash-size sizes mus= t be >=3D 1 (preferably a power of 2)");
@@ -7603,8= +7598,8 @@
int cf_max, cf_per;
<= /span>
VERIFY_PERMISSION(OPT_P_GENERAL);
- cf_max =3D atoi(p[1]);<= br>- cf_per =3D atoi(p[2])= ;
+ cf_max =3D= atoi_warn(p[1], msglevel);
+ cf_per =3D atoi_warn(p[2], msglevel);
= if (cf_max < 0 || cf_per < 0)
{ msg(msglevel, "--connect-freq parms must be > = 0");
@@ -7634,7 +7629,7 @@
in= t 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"= );

@@ -7650,7 +7645,7 @@
else if (stre= q(p[0], "max-routes-per-client") && p[1] && !p[2]= )
{
VERIFY_PERMISSION(OPT_P_I= NHERIT);
- optio= ns->max_routes_per_client =3D max_int(atoi(p[1]), 1);
+ options->max_routes_per_cli= ent =3D max_int(positive_atoi(p[1], msglevel), 1);
}
else if (streq(p[0], "client-cert-not-required&quo= t;) && !p[1])
{
@@ -7734,14 +7= 729,14 @@
{
VERIFY_PERMISSION= (OPT_P_GENERAL);
options->auth_token_generate = =3D true;
- opti= ons->auth_token_lifetime =3D p[1] ? positive_atoi(p[1]) : 0;
<= span style=3D"color: hsl(120, 100%, 40%);">+ options->auth_token_= lifetime =3D p[1] ? positive_atoi(p[1], msglevel) : 0;


for (int i =3D 2; i < MAX_PARMS && p[i] != =3D NULL; i++)
{
/* t= he second parameter can be the renewal time */
- if (i =3D=3D 2 && positive_ato= i(p[i]))
+ = if (i =3D=3D 2 && valid_integer(p[i], true))
= {
- = 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;))
{
@@ -7821,7 +7816,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");
@@ -7833,7 +7828,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");
@@= -7964,10 +7959,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[2], msglevel);

}
= else
{
@@ -7996,7 +7991,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= ])
{
@@ -8021,7 +8016,7 @@
<= span> {

VERIFY_PERMISSION(OPT_P_GENERAL);
options->sc_info.challenge_text =3D p[1];- if (atoi(p[2]))<= br>+ if (atoi_warn(p[2],= msglevel))
{
options= ->sc_info.flags |=3D SC_ECHO;
}
@@ -8117,7 +8112,7 @@

{
= if (!streq(p[2], "default"))
= {
- = int offset =3D atoi(p[2]);
+ int offset =3D atoi_warn(p[2], msglevel= );

if (!(offset >= -256 && offset < 256))
{
@@ -8133,7 +8128,7 @@
{
const int min_lease =3D 30;
int lease_time;

- lease_time =3D atoi(p[3]);
= + lease_time= =3D atoi_warn(p[3], msglevel);
if (le= ase_time < min_lease)
{
<= span> msg(msglevel, "--ip-win32 dynamic [offse= t] [lease-time]: lease time parameter (%d) must be at least %d seconds"= ;, lease_time, min_lease);

@@ -8257,7 +8252,7 @@
= else if (streq(p[1], "NBT") && p[2] &&= amp; !p[3])
{
int t;<= /span>
- t =3D atoi= (p[2]);
+ = t =3D atoi_warn(p[2], msglevel);
if (!(t =3D= =3D 1 || t =3D=3D 2 || t =3D=3D 4 || t =3D=3D 8))
= {
msg(msglevel, "--dhcp-option NB= T: parameter (%d) must be 1, 2, 4, or 8", t);
@@ -8315= ,7 +8310,7 @@
#if defined(TARGET_ANDROID)
= else if (streq(p[1], "PROXY_HTTP") && p[3] &= & !p[4])
{
- o->http_proxy_port =3D atoi(p[3]);<= br>+ o->http_prox= y_port =3D positiove_atoi(p[3], msglevel);
o-&= gt;http_proxy =3D p[2];
}
#endif<= /span>
@@ -8349,7 +8344,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(msglev= el, "--tap-sleep parameter must be between 0 and 255");@@ -8432,7 +8427,7 @@
options->exit_even= t_name =3D p[1];
if (p[2])
= {
- option= s->exit_event_initial_state =3D (atoi(p[2]) !=3D 0);
+ options->exit_event_init= ial_state =3D (atoi_warn(p[2], msglevel) !=3D 0);
= }
}
else if (streq(p[0], "al= low-nonadmin") && !p[2])
@@ -8799,7 +8794,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-windo= w window size parameter (%d) must be between %d and %d",
@@ -8814,7 +8809,7 @@

{
= int replay_time;

- replay_time =3D atoi(p[2]);
+ replay_t= ime =3D atoi_warn(p[2], msglevel);
if (!(M= IN_TIME_BACKTRACK <=3D replay_time && replay_time <=3D MAX_TI= ME_BACKTRACK))
{
= msg(msglevel, "replay-window time window parameter (%d) mu= st be between %d and %d",
@@ -9256,7 +9251,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]);
<= span style=3D"color: hsl(120, 100%, 40%);">+ options->tls_timeout= =3D positive_atoi(p[1], msglevel);

}
= else if (streq(p[0], "reneg-bytes") && p[1] &&am= p; !p[2])
{
@@ -9285,21 +9280,21 @@
else if (streq(p[0], "reneg-sec") && p= [1] && !p[3])
{
VERIF= Y_PERMISSION(OPT_P_TLS_PARMS);
- options->renegotiate_seconds =3D positive_atoi(p[1]);
+ options->r= enegotiate_seconds =3D positive_atoi(p[1], msglevel);
= if (p[2])
{
- options->renegotiate_seconds_min =3D posi= tive_atoi(p[2]);
+ = options->renegotiate_seconds_min =3D positive_atoi(p[2], msglev= el);
}
}
= 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])
{
@@ -9436,7 +9431,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[2], msglevel) !=3D 0 ));
#ifdef DEFAULT_PKCS11_MODULE
= if (!provider)
@@ -9488,7 +9483,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], "pkc= s11-private-mode") && p[1])
@@ -9510,13 +9505,= 13 @@

for (j =3D 1; j < MAX_P= ARMS && p[j] !=3D NULL; ++j)
{
<= span style=3D"color: hsl(0, 100%, 40%);">- options->pkcs11_ce= rt_private[j-1] =3D atoi(p[j]) !=3D 0 ? 1 : 0;

+ options->pkcs11_cert_private[j-1]= =3D (bool) (atoi_warn(p[j], msglevel));
}<= br> }
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])
{@@ -9545,12 +9540,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], ms= glevel);
}
#ifdef HAVE_EXPORT_KEYING_= MATERIAL
else if (streq(p[0], "keying-material-ex= porter") && 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);

@@ -9609,7 +9604,7 @@
else if (str= eq(p[0], "vlan-pvid") && p[1] && !p[2]) {
VERIFY_PERMISSION(OPT_P_GENERAL|OPT_= P_INSTANCE);
- o= ptions->vlan_pvid =3D positive_atoi(p[1]);
+ options->vlan_pvid =3D positive_atoi(p= [1], msglevel);
if (options->vlan_pvid < OPE= NVPN_8021Q_MIN_VID
|| options->vlan_pvid &g= t; OPENVPN_8021Q_MAX_VID)
{
diff -= -git a/src/openvpn/options_util.c b/src/openvpn/options_util.c
index a9e020a..fea4c3d 100644

--- a/src/openvpn/options= _util.c
+++ b/src/openvpn/options_util.c
@@= -98,3 +98,50 @@
gc_free(&gc);
= return message;
}
+
+bo= ol
+valid_integer(con= st char *str, bool positive)
+{
+ char = *endptr;
+ long lo= ng i =3D strtoll(str, &endptr, 10);
+
= + if (i < INT_MIN || (positive && i < 0) || *endptr !=3D &= #39;\0' || i > INT_MAX)
+ {
+ = return false;
+ = }
+ else=
+ {
+ return true;
+ }
+}
+
+int
<= span style=3D"color: hsl(120, 100%, 40%);">+positive_atoi(const char *str, = int msglevel)

+{
+ char *endptr;=
+ long long i =3D strtol= l(str, &endptr, 10);
+
+ if (i <= 0 || *endptr !=3D '\0' || i > INT_MAX)
+ {
+ msg(msglevel, "Cannot parse argument '%s&= #39; as non-negative integer",
+ str);
+ i =3D 0;
+ }
+
+ return (int) i;
+}
+
+int
+= atoi_warn(const char *str, int msglevel)
+{
= + long long i =3D strtoll(str, &endptr, 10);
+
+ if (i < INT_MIN || *endptr !=3D '\0' || i >= ; INT_MAX)
+ {
+ msg(msglevel, &= quot;Cannot parse argument '%s' as integer", str);
<= span style=3D"color: hsl(120, 100%, 40%);">+ i =3D 0;

+ }

+
+ return (int) i;
+}
diff --git a/src/openvpn/options_util.h b/src/ope= nvpn/options_util.h
index 29bc9dc..f34d997 100644--- a/src/openvpn/options_util.h
+++ b/src/openvpn/o= ptions_util.h
@@ -30,4 +30,24 @@
const cha= r *
parse_auth_failed_temp(struct options *o, const char *= reason);

-#endif
+<= br>+/** Checks if the string is= a valid integer by checking if it can be
+ * converted to an integer */
+bool
+valid_integer(const char *str, bool positive);+
+/**
+ * Converts a str to a positive number if the string represents = a postive
+ * integer= number. Otherwise print a warning with msglevel and return 0
+ */

+int
+positive_atoi(const char *str, int msglevel);
+
+/**
= + * Converts a str to an integer if the string can be represented as an
+ * integer number. Othe= rwise print a warning with msglevel and return 0
+ */
+int
+ato= i_warn(const char *str, int msglevel);
+
+= #endif /* ifndef OPTIONS_UTIL_H_ */

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: 7
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-MessageType: newpatchset
--XHJ8uaMC1mo=--