From owner-svn-src-head@freebsd.org Tue Dec 13 18:33:36 2016 Return-Path: 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 2E275C76F54; Tue, 13 Dec 2016 18:33:36 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F3D3E385; Tue, 13 Dec 2016 18:33:35 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-qk0-f193.google.com with SMTP id h201so15710512qke.3; Tue, 13 Dec 2016 10:33:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=jIim6cjcP3ComBgueM6AtmMKydV6D5a3HnHWeUMmaZg=; b=UtNXKBG8qwryRjknzWmpynSptvntgPEEfLn1twM1JM3UWJxFgHI4FCM6siYNxVIMOh T4sdW/TxB+FO99/pj4j/C6rIqyS33CeWR+ua98jOI/oPzcPSmTigB2kD7268jPvDQ60I gKCfFZy/CJMJnu+NxPGv56LJcYy/8yT8DBvi3p2QR4YEGaSw92nzCdYRGsxeursMSyW+ FrgOxE/5dhh+h/r2H6cK4+mIsfWEFZK5WiSPg7RJBrixFtb/WMUQo2ZWT8gajY+jw2gY t6SNiOhvxdok7z/AIf5J93vu+uLe7Pm+xpVHfNY0sY/VashX8fvpC3t1dZQcyPCimV/k 7wMQ== X-Gm-Message-State: AKaTC00W+zHwPVQC+suFsu4wabHWPWvUlp9cH/HG5KPTRUs59U1HhBV5X4uRafEU8xfYRw== X-Received: by 10.55.64.69 with SMTP id n66mr81498248qka.20.1481652894050; Tue, 13 Dec 2016 10:14:54 -0800 (PST) Received: from mail-qk0-f171.google.com (mail-qk0-f171.google.com. [209.85.220.171]) by smtp.gmail.com with ESMTPSA id w34sm29688007qtw.10.2016.12.13.10.14.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2016 10:14:53 -0800 (PST) Received: by mail-qk0-f171.google.com with SMTP id x190so125112366qkb.0; Tue, 13 Dec 2016 10:14:53 -0800 (PST) X-Received: by 10.55.139.134 with SMTP id n128mr84349228qkd.43.1481652893617; Tue, 13 Dec 2016 10:14:53 -0800 (PST) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.200.58.165 with HTTP; Tue, 13 Dec 2016 10:14:53 -0800 (PST) In-Reply-To: <201612121933.uBCJXen2093959@repo.freebsd.org> References: <201612121933.uBCJXen2093959@repo.freebsd.org> From: Conrad Meyer Date: Tue, 13 Dec 2016 10:14:53 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r309933 - head/usr.sbin/syslogd To: Hiroki Sato Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Dec 2016 18:33:36 -0000 On Mon, Dec 12, 2016 at 11:33 AM, Hiroki Sato wrote: > Author: hrs > Date: Mon Dec 12 19:33:40 2016 > New Revision: 309933 > URL: https://svnweb.freebsd.org/changeset/base/309933 > > Log: > - Refactor listening socket list. All of the listening sockets are > now maintained in a single linked-list in a transport-independent manner. > - Use queue.h for linked-list structure. > - Use linked-list for AllowedPeers. > - Use getaddrinfo(8) even for Unix Domain sockets. > - Use macros to type-casting from/to struct sockaddr{,_in,_in6}. > - Define fu_* macro for union f_un to shorten the member names. > - Remove an extra #include . > - Add "static" to non-exported symbols. > - !INET support is still incomplete but will be fixed later. > > There is no functional change except for some minor debug messages. Hello Hiroki, This refactor introduced a bug in the IPv6 address comparison/rejection logic. > Modified: head/usr.sbin/syslogd/syslogd.c > ============================================================================== > --- head/usr.sbin/syslogd/syslogd.c Mon Dec 12 19:26:55 2016 (r309932) > +++ head/usr.sbin/syslogd/syslogd.c Mon Dec 12 19:33:40 2016 (r309933) > ... > reject = 0; > - for (j = 0; j < 16; j += 4) { > - if ((*(u_int32_t *)&sin6->sin6_addr.s6_addr[j] & *(u_int32_t *)&m6p->sin6_addr.s6_addr[j]) > - != *(u_int32_t *)&a6p->sin6_addr.s6_addr[j]) { > - ++reject; > - break; > - } > + if (IN6_ARE_MASKED_ADDR_EQUAL(&sin6->sin6_addr, > + &a6p->sin6_addr, &m6p->sin6_addr) != 0) { > + ++reject; > + break; > } > if (reject) { > dprintf("rejected in rule %d due to IP mismatch.\n", i); The new check isn't a loop, so the 'break' breaks out of the outer loop, which is unintentional. I think we should just remove 'break'. This was found by Coverity CID 1366941. Best, Conrad