From owner-freebsd-bugs@freebsd.org Wed Jan 8 01:56:07 2020 Return-Path: Delivered-To: freebsd-bugs@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 395661F8DE1 for ; Wed, 8 Jan 2020 01:56:07 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 47ssm70r7Vz3RGC for ; Wed, 8 Jan 2020 01:56:07 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 1C8431F8DE0; Wed, 8 Jan 2020 01:56:07 +0000 (UTC) Delivered-To: bugs@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1BB931F8DDF for ; Wed, 8 Jan 2020 01:56:07 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47ssm700kJz3RGB for ; Wed, 8 Jan 2020 01:56:07 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EF391886B for ; Wed, 8 Jan 2020 01:56:06 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 0081u6JI018444 for ; Wed, 8 Jan 2020 01:56:06 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 0081u6RY018443 for bugs@FreeBSD.org; Wed, 8 Jan 2020 01:56:06 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 243164] blacklistd not handling masks correctly Date: Wed, 08 Jan 2020 01:56:06 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: 12.1-STABLE X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: cem@freebsd.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2020 01:56:07 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D243164 --- Comment #3 from Conrad Meyer --- Ah. I wonder if this is it? 459 #define MASK(m) ((uint32_t)~((1 << (32 - (m))) - 1)) 460 461 static int 462 conf_amask_eq(const void *v1, const void *v2, size_t len, int mask) 463 { 464 const uint32_t *a1 =3D v1; 465 const uint32_t *a2 =3D v2; 466 uint32_t m; 467 int omask =3D mask; 468 469 len >>=3D 2; 470 switch (mask) { 471 case FSTAR: 472 if (memcmp(v1, v2, len) =3D=3D 0) 473 return 1; 474 goto out; // Above is definitely wrong, only compares the first 1/4 of the address // bytes. Maybe that's what we're seeing? ... 484 for (size_t i =3D 0; i < len; i++) { 485 if (mask > 32) { 486 m =3D htonl((uint32_t)~0); 487 mask -=3D 32; 488 } else if (mask) { 489 m =3D htonl(MASK(mask)); 490 mask =3D 0; 493 if ((a1[i] & m) !=3D (a2[i] & m)) 494 goto out; // This part seems fine for v4, but I'm not sure if it's correct for v6. 495 } 496 return 1; 497 out: ... 506 return 0; --=20 You are receiving this mail because: You are the assignee for the bug.=