Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 15 Mar 2021 04:20:42 -0700
From:      David Wolfskill <david@catwhisker.org>
To:        current@freebsd.org
Subject:   Recent if_wg work: Should DIAGNOSTIC imply KASSERT is available?
Message-ID:  <YE9DCkulTOWAaPuh@albert.catwhisker.org>
next in thread | raw e-mail | index | archive | help 

--6uCFyH+bg6AMMICa
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

For my laptop, the kernel config includes GENERIC, does not have

options       INVARIANTS

but does have

options         DIAGNOSTIC

which has not been a problem until today.

In src/sys/dev/if_wg/wg_noise.c, as of main-n245465-16b2290447de, I see:

=2E..
    778 static void
    779 noise_kdf(uint8_t *a, uint8_t *b, uint8_t *c, const uint8_t *x,
    780     size_t a_len, size_t b_len, size_t c_len, size_t x_len,
    781     const uint8_t ck[NOISE_HASH_LEN])
    782 {
    783         uint8_t out[BLAKE2S_HASH_SIZE + 1];
    784         uint8_t sec[BLAKE2S_HASH_SIZE];
    785=20
    786 #ifdef DIAGNOSTIC
    787         KASSERT(a_len <=3D BLAKE2S_HASH_SIZE && b_len <=3D BLAKE2S_=
HASH_SIZE    787  &&
    788                         c_len <=3D BLAKE2S_HASH_SIZE);
    789         KASSERT(!(b || b_len || c || c_len) || (a && a_len));
    790         KASSERT(!(c || c_len) || (b && b_len));
    791 #endif
    792=20
=2E...

which the compiler helpfully pointed out to me attempts to use KASSERT
without having it defined.

So: Is DIAGNOSTIC intended to necessarily imply that KASSERT is
available for use?

Thanks!

Peace,
david
--=20
David H. Wolfskill                              david@catwhisker.org
That broadly-popular "American Rescue Plan" (stimulus/COVID relrief)?
Ever Republican vote in Congress was against it.

See https://www.catwhisker.org/~david/publickey.gpg for my public key.

--6uCFyH+bg6AMMICa
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAmBPQwpfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy
OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2
Pck7mwgAqAWYbSOhohCdAFaUNxTrP3uj/nc5YKVw4VwqgQ96XAENq4WSLuGCYBV6
TYupaGyG7hz9bc/W7JBchw9gUzVq+KBZEx4RYdNjlwbxz/WzY/ifGIpLssJcWEnU
JOr30zpOsKawNjuhLim4+KDQpP7umPw+QyUfTXNHPvArfZZJmXZxqN+5k+GAHUXL
2rN5PFHgypToRe+3G2GODo9ERfRLI1/fKvRDU/XsUzB40J54/sdgDLuxPWEqO5rP
vlIEdMj0/16hik6Qeoj7VbIj5/erFOom3jehM70rgYlkPnMlbERW4/LQGa/Xq+qz
fYiKXzrXaCS0POO4RuZbk3vJX39//Q==
=YpdF
-----END PGP SIGNATURE-----

--6uCFyH+bg6AMMICa--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YE9DCkulTOWAaPuh>