Date: Thu, 10 Nov 2016 08:06:33 +0000 From: prosecutefnvsv@gmail.com To: svn-src-head@freebsd.org Subject: =?UTF-8?B?IOS4gOWkqTQ55Liq5LiA5a+55LiA5Zue5aSN77yM5oq15b6X6L+H5LiA5Liq5pyI55qE?= =?UTF-8?B?5a+755uY6YeP?= Message-ID: <001a113d0acc0eab500540eddabf@google.com>
next in thread | raw e-mail | index | archive | help
5oiR5bey6YKA6K+35oKo5aGr5YaZ5Lul5LiL6KGo5Y2V77yaDQrmnKrlkb3lkI3nmoTooajljZUN Cg0K6KaB5aGr5YaZ5q2k6KGo5Y2V77yM6K+36K6/6Zeu77yaDQpodHRwczovL2RvY3MuZ29vZ2xl LmNvbS9mb3Jtcy9kL2UvMUZBSXBRTFNmLXFsSUdVR3BVMldtcjMweXRYU3A1a1ZiWXFZekw1Z2s1 bk5jVXlQejZFb2pST1Evdmlld2Zvcm0/Yz0wJmFtcDt3PTEmYW1wO3VzcD1tYWlsX2Zvcm1fbGlu aw0KDQrkuLvliqjmib7lrqLmiLfnmoTml7bku6MNCjEu6K6p5YWo55CD5r2c5Zyo5a6i5oi36YO9 6K6w5L2P5L2gIO+8iOWvueWFqOeQg+ebruagh+WuouaIt+WRqOacn+S4u+WKqOW7uueri+iBlOe7 nO+8jOeyvuWHhuaOqOW5v+aViOaenO+8iQ0KMi7orqnlm6LpmJ/mm7TliqDnqLPlrprvvIgg5Lia 5Yqh5ZGY5Li75Yqo5Yib6YCg5py65Lya77yM5q+P5aSp5pyJ5LqL5YGa77yJDQozLuWuouaIt+i1 hOaWme+8jOadpeW+gOmCruS7tu+8jOi9u+advueuoeeQhu+8iOWuouaIt+i1hOaWmembhuS4re+8 jOW+gOadpemCruS7tuiHquWKqOW9ouaIkOiBlOezu+iusOW9le+8jOacieaViCANCui+heWvvOS4 muWKoeWboumYn++8iQ0KNC7ovbvmnb7lkK/liqjlpJbotLjkuJrliqHvvIgg5pyA5a655piT5om+ 5Yiw5bel5L2c5YWl5Y+j77yMTm8g5bGV5Lya77yMTm/lubPlj7DvvIxOMOaJi+W3peaQnOe0ouWu ouaIt++8iQ0KDQogIOWSqOivolEgUTogMjUzNTU4ODMwOA0KICAgIOeUtSDor53vvJoxMzY3MDIw MDYxNQ0KDQoNCkdvb2dsZeihqOWNle+8muWIm+W7uuiwg+afpemXruWNt+W5tuWIhuaekOiwg+af pee7k+aenOOAgg0K From owner-svn-src-head@freebsd.org Thu Nov 10 10:45:13 2016 Return-Path: <owner-svn-src-head@freebsd.org> Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5426C392C2; Thu, 10 Nov 2016 10:45:13 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D515987; Thu, 10 Nov 2016 10:45:13 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAAAjC5v098417; Thu, 10 Nov 2016 10:45:12 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAAAjCvp098416; Thu, 10 Nov 2016 10:45:12 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201611101045.uAAAjCvp098416@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon <avg@FreeBSD.org> Date: Thu, 10 Nov 2016 10:45:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r308479 - head/usr.sbin/watchdogd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>; List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 10 Nov 2016 10:45:13 -0000 Author: avg Date: Thu Nov 10 10:45:12 2016 New Revision: 308479 URL: https://svnweb.freebsd.org/changeset/base/308479 Log: fix a watchdogd regression introduced in r308040 The code assumed that 'timeout' and 'timeout_sec' are in sync which they weren't if no '-t' option was passed to watchdogd. Reported by: Olivier Smedts <olivier@gid0.org>, Alex Deiter <alex.deiter@gmail.com> Tested by: Olivier Smedts <olivier@gid0.org>, Alex Deiter <alex.deiter@gmail.com> MFC after: 5 days X-MFC with: r308040 Modified: head/usr.sbin/watchdogd/watchdogd.c Modified: head/usr.sbin/watchdogd/watchdogd.c ============================================================================== --- head/usr.sbin/watchdogd/watchdogd.c Thu Nov 10 07:05:41 2016 (r308478) +++ head/usr.sbin/watchdogd/watchdogd.c Thu Nov 10 10:45:12 2016 (r308479) @@ -685,10 +685,15 @@ seconds_to_pow2ns(int seconds) static void parseargs(int argc, char *argv[]) { + struct timespec ts; int longindex; int c; const char *lopt; + /* Get the default value of timeout_sec from the default timeout. */ + pow2ns_to_ts(timeout, &ts); + timeout_sec = ts.tv_sec; + /* * if we end with a 'd' aka 'watchdogd' then we are the daemon program, * otherwise run as a command line utility. @@ -731,9 +736,9 @@ parseargs(int argc, char *argv[]) case 't': timeout_sec = atoi(optarg); timeout = parse_timeout_to_pow2ns(c, NULL, optarg); - if (debugging) - printf("Timeout is 2^%d nanoseconds\n", - timeout); + if (debugging) + printf("Timeout is 2^%d nanoseconds\n", + timeout); break; case 'T': carp_thresh_seconds = @@ -782,10 +787,7 @@ parseargs(int argc, char *argv[]) if (is_daemon && timeout < WD_TO_1SEC) errx(EX_USAGE, "-t argument is less than one second."); if (pretimeout_set) { - struct timespec ts; - - pow2ns_to_ts(timeout, &ts); - if (pretimeout >= (uintmax_t)ts.tv_sec) { + if (pretimeout >= timeout_sec) { errx(EX_USAGE, "pretimeout (%d) >= timeout (%d -> %ld)\n" "see manual section TIMEOUT RESOLUTION",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?001a113d0acc0eab500540eddabf>