------------------------------------------------------------------------ r369477 | git2svn | 2021-03-16 10:57:36 -0700 (Tue, 16 Mar 2021) | 24 lines ns8250: don't drop IER_TXRDY on bus_grab/ungrab It has been observed that some systems are often unable to resume from ddb after entering with debug.kdb.enter=1. Checking the status further shows the terminal is blocked waiting in tty_drain(), but it never makes progress in clearing the output queue, because sc->sc_txbusy is high. I noticed that when entering polling mode for the debugger, IER_TXRDY is set in the failure case. Since this bit is never tracked by the softc, it will not be restored by ns8250_bus_ungrab(). This creates a race in which a TX interrupt can be lost, creating the hang described above. Ensuring that this bit is restored is enough to prevent this, and resume from ddb as expected. The solution is to track this bit in the sc->ier field, for the same lifetime that TX interrupts are enabled. PR: 223917, 240122 Sponsored by: The FreeBSD Foundation (cherry picked from commit 7e7f7beee732810d3afcc83828341ac3e139b5bd) Git Hash: a54c346ff3e80ff8f2f3d0ec56b5374a7dc34429 Git Author: mhorne@FreeBSD.org ------------------------------------------------------------------------ r369478 | git2svn | 2021-03-18 10:00:57 -0700 (Thu, 18 Mar 2021) | 16 lines netmap: fix memory leak in NETMAP_REQ_PORT_INFO_GET The netmap_ioctl() function has a reference counting bug in case of NETMAP_REQ_PORT_INFO_GET command. When `hdr->nr_name[0] == '\0'`, the function does not decrease the refcount of "nmd", which is increased by netmap_mem_find(), causing a refcount leak. Reported by: Xiyu Yang Submitted by: Carl Smith MFC after: 3 days PR: 254311 (cherry picked from commit 0ab5902e8ad93d0a9341dcce386b6c571ee02173) Git Hash: 09b2bde74654a16c56ade52411c464ef79de8cd4 Git Author: vmaffione@FreeBSD.org ------------------------------------------------------------------------ r369480 | kp | 2021-03-20 03:02:15 -0700 (Sat, 20 Mar 2021) | 11 lines pf: Factor out pf_krule_free() Reviewed by: melifaro@ MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D29194 (cherry picked from commit 5e9dae8e149ae8848f52148b665f3a0d031ca40f) Git Hash: d9653edbaeae779ed331d1d7331ded1348f2b980 Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369481 | kp | 2021-03-20 03:02:21 -0700 (Sat, 20 Mar 2021) | 14 lines pf: Retrieve DSCP value from the IPv6 header Teach pf to read the DSCP value from the IPv6 header so that we can match on them. Reviewed by: donner MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D29048 (cherry picked from commit f19323847ca894af8a58839f6a2a41691a8e2245) Git Hash: e7e1836a0efadfdb5f8e8e4c7ad41f1211f55f2d Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369482 | kp | 2021-03-20 03:02:25 -0700 (Sat, 20 Mar 2021) | 19 lines altq: Increase maximum number of CBQ and HFSC classes In some configurations we need more classes than ALTQ supports by default. Increase the maximum number of classes we allow. This will only cost us a comparatively trivial amount of memory, so there's little reason not to do so. If ever we find we want even more we may want to consider turning these defines into a tunable, but for now do the easy thing. Reviewed by: donner@ MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D29034 (cherry picked from commit 448732b8e2d9bf4e2656a2e5a9e88cc58b88d4f4) Git Hash: 2e2e51f15ae521c1e3e5f399f4799697e9e5f000 Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369483 | git2svn | 2021-03-20 03:02:28 -0700 (Sat, 20 Mar 2021) | 14 lines pf: Remove redundant kif != NULL checks pf_kkif_free() already checks for NULL, so we don't have to check before we call it. Reviewed by: melifaro@ MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D29195 (cherry picked from commit 913e7dc3e0eb7df78ec0e7ecc7dd160a316a3ac6) Git Hash: 28ed948ec1d74009bc90a661007b017c7e8471c7 Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369484 | kp | 2021-03-20 03:02:31 -0700 (Sat, 20 Mar 2021) | 12 lines pf: Simplify cleanup We can now counter_u64_free(NULL), so remove the checks. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D29190 (cherry picked from commit 28dc2c954f5096ae594ed5cd7a83d66ce4bf1ded) Git Hash: f858f6b2381c07ae75f672064e647c6c691d4b88 Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369485 | kp | 2021-03-20 03:02:33 -0700 (Sat, 20 Mar 2021) | 17 lines pf: Fully remove interrupt events on vnet cleanup swi_remove() removes the software interrupt handler but does not remove the associated interrupt event. This is visible when creating and remove a vnet jail in `procstat -t 12`. We can remove it manually with intr_event_destroy(). PR: 254171 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D29211 (cherry picked from commit cecfaf9bede9665d6a10f1e575cd5d575450cff7) Git Hash: f11b9574cd186762c4883e8819896c6475be3027 Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369486 | gbe | 2021-03-20 03:25:34 -0700 (Sat, 20 Mar 2021) | 9 lines i386: Fix a few typos - wheter -> whether - while here, fix some whitespace issues (cherry picked from commit 564a3ac63abe166c6174ed3a58e78859a738ee58) Git Hash: 82f434c2b443befada1ef1225a375b00aa5574c6 Git Author: gbe@FreeBSD.org ------------------------------------------------------------------------ r369487 | gbe | 2021-03-20 03:26:05 -0700 (Sat, 20 Mar 2021) | 9 lines net80211: Fix a typo in a comment - destionation -> destination - while here, fix some whitespace issues (cherry picked from commit d197bf2b20e7efc6ffef520bf96d5f642e26a015) Git Hash: d57aee49378e2066b53dca9e306b4697b7c74858 Git Author: gbe@FreeBSD.org ------------------------------------------------------------------------ r369488 | gbe | 2021-03-20 03:27:04 -0700 (Sat, 20 Mar 2021) | 11 lines find(1): Mark -not as an extensions to POSIX While here, change mdoc macro from Ic to Fl. PR: 253499 Reported by: Michael Siegel (cherry picked from commit 75e6f664c469927ca73ecd7b16a8058bc292a451) Git Hash: a03c85daaefc58693208f2c74aaf46e5932ff1d2 Git Author: debdrup@FreeBSD.org ------------------------------------------------------------------------ r369489 | gbe | 2021-03-20 03:28:03 -0700 (Sat, 20 Mar 2021) | 14 lines find(1): Refine the HISTORY within the manual page. A simple find command appeared in Version?1 AT&T UNIX and was removed in Version?3 AT&T UNIX. It was rewritten for Version?5 AT&T UNIX and later be enhanced for the Programmer's Workbench (PWB). These changes were later incorporated in AT&T UNIX v7. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D29114 (cherry picked from commit a9275d996c229a30879baa42a6d02d24663ac43b) Git Hash: af0cea80104a048da05b818ebcb85ad8b3ba89a0 Git Author: gbe@FreeBSD.org ------------------------------------------------------------------------ r369490 | git2svn | 2021-03-20 07:50:39 -0700 (Sat, 20 Mar 2021) | 13 lines pfctl: Add missing 'va' code point name Add the 'va' (voice-admit, RFC5865) symbolic name. Reviewed by: rgrimes, gbe (man page) MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D29069 (cherry picked from commit b4e3f3c2de6e6dc614f99615e50d0d87f3367ca0) Git Hash: 5856802668ac672efec6ac8bbfa69d34eb2e75a8 Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369491 | kp | 2021-03-20 07:50:45 -0700 (Sat, 20 Mar 2021) | 10 lines pf tests: Test tos/dscp matching MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D29078 (cherry picked from commit 9d3b2bcf761041bbe79da3de25f2e4142d90b46a) Git Hash: e72bcc45ad1551f4390ed84b53c73970c3e6c8f9 Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369492 | kp | 2021-03-20 07:50:47 -0700 (Sat, 20 Mar 2021) | 10 lines pf tests: Fix unsupported ping6 argument ping6 (in stable/12) does not support '-t'. Change it to '-X'. Direct commit to stable/12. Sponsored by: Rubicon Communications, LLC ("Netgate") Git Hash: e6e75224a5ae60db848b8c5e6021375a1340744a Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369493 | dchagin | 2021-03-20 08:19:37 -0700 (Sat, 20 Mar 2021) | 11 lines Add warning to the Linuxulator makefiles that building it outside of a kernel does not make sence. PR: 222861 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D20179 (cherry picked from commit 6e4cf32e95841b4c3ef0caeb80802bf528a35cd0) Git Hash: 097e0b8955762c043b01ba247e59d704a83d222a Git Author: dchagin@FreeBSD.org ------------------------------------------------------------------------ r369494 | git2svn | 2021-03-20 22:36:17 -0700 (Sat, 20 Mar 2021) | 10 lines Complete LOCAL_PEERCRED support. Cache pid of the remote process in the struct xucred. Do not bump XUCRED_VERSION as struct layout is not changed. PR: 215202 Differential Revision: https://reviews.freebsd.org/D20415 (cherry picked from commit c5afec6e895a11c64f58eb99e493adb8ad5dc361) Git Hash: 925f44f33862908f9a2e72520a17af148c7d0db5 Git Author: dchagin@FreeBSD.org ------------------------------------------------------------------------ r369495 | dchagin | 2021-03-20 22:37:03 -0700 (Sat, 20 Mar 2021) | 9 lines Remove wrong inline keyword. Reported by: markj MFC after: 1 week (cherry picked from commit c8124e20e5493651b5adca11c0c796cdcf5b2696) Git Hash: 3430e229287ce440f834e023bb33bb21a666fc0f Git Author: dchagin@FreeBSD.org ------------------------------------------------------------------------ r369496 | dchagin | 2021-03-20 23:09:40 -0700 (Sat, 20 Mar 2021) | 8 lines Merge tcsh 6.22.03-ceccc7f PR: 252663 (cherry picked from commit 5224c2a3bc95b431f729f3692f264395248d8acc) Git Hash: 2c31ae65cd9271eaf24da4fbd8f508af75e62a13 Git Author: dchagin@FreeBSD.org ------------------------------------------------------------------------ r369497 | dchagin | 2021-03-21 00:08:22 -0700 (Sun, 21 Mar 2021) | 22 lines linux: make timerfd_settime(2) set expirations count to zero On Linux, read(2) from a timerfd file descriptor returns an unsigned 8-byte integer (uint64_t) containing the number of expirations that have occurred, if the timer has already expired one or more times since its settings were last modified using timerfd_settime(), or since the last successful read(2). That's to say, once we do a read or call timerfd_settime(), timer fd's expiration count should be zero. Some Linux applications create timerfd and add it to epoll with LT mode, when event comes, they do timerfd_settime instead of read to stop event source from trigger. On FreeBSD, timerfd_settime(2) didn't set the count to zero, which caused high CPU utilization. PR: 252820 Submitted by: ankohuu_outlook.com (Shunchao Hu) Differential Revision: https://reviews.freebsd.org/D28231 (cherry picked from commit ae71b794cbed19e5e25effc3438720ad452ab87c) Git Hash: bf1863de6b1fb813192e45639b4cfde65a624b6b Git Author: ankohuu@outlook.com ------------------------------------------------------------------------ r369498 | dchagin | 2021-03-21 03:34:40 -0700 (Sun, 21 Mar 2021) | 9 lines Use C11 anonymous unions. PR: 215202 Reported by: glebius (cherry picked from commit a5ec4a9dba5629dfe146ae9534e91e5e957747eb) Git Hash: 2b61bda2c75f30f6eadd18fb891fd885e4c8d19d Git Author: dchagin@FreeBSD.org ------------------------------------------------------------------------ r369499 | git2svn | 2021-03-21 08:54:54 -0700 (Sun, 21 Mar 2021) | 26 lines bc: Upgrade to version 3.2.4 This update changes the behavior of "-e" or "-f" in BC_ENV_ARGS: Use of these options on the command line makes bc exit after executing the given commands. These options will not cause bc to exit when passed via the environment (but EOF in STDIN or -e or -f on the command line will make bc exit as before). The same applies to DC_ENV_ARGS with regard to the dc program. Make length(0) and length(0.0) return 1 for compatibility with GNU bc and the traditional FreeBSD bc. Fix a potential division by zero error in a non-standard (extended) math library function. (cherry picked from commit e458944cf9deec51d03ec751050a58ddf43e796f) (cherry picked from commit 9a995fe186257315e7b3d01e24c55d86bb18fd32) (cherry picked from commit 4aa71da8dc004aa5027836259433e5bff3cd9104) (cherry picked from commit 028616d0dd69a3da7a30cb94d35f040bf2ced6b9) (cherry picked from commit f165641df4da1752f8bb1f55c1e602cdb657fba4) (cherry picked from commit 893ecb52db5ed47d6c1e8698334d34e0df651612) Git Hash: 92db69bf876227ae9bf97874404a156bb5926334 Git Author: se@FreeBSD.org ------------------------------------------------------------------------ r369500 | kib | 2021-03-21 10:56:44 -0700 (Sun, 21 Mar 2021) | 9 lines open(2): Remove O_BENEATH and AT_BENEATH Discussed with: emaste, re Tested by: pho (cherry picked from commit 20e91ca36a56b8db1e6677f577ad011b66dd6eb3) Git Hash: 2e21e1d5fe8e9f0b0817f831412ada6500f7bcbd Git Author: kib@FreeBSD.org ------------------------------------------------------------------------ r369501 | kib | 2021-03-21 10:56:47 -0700 (Sun, 21 Mar 2021) | 8 lines Do not call nameicap_tracker_add() for dotdot case. Tested by: pho (cherry picked from commit 59e749428111c029116a4302a544c7cc18b33772) Git Hash: 7b7708867c4473f47a577427320459f57a70d458 Git Author: kib@FreeBSD.org ------------------------------------------------------------------------ r369502 | kib | 2021-03-21 10:56:49 -0700 (Sun, 21 Mar 2021) | 8 lines nameicap_tracker_add: avoid duplicates in the tracker list Tested by: pho (cherry picked from commit 2388ad7c293fbc89ee239a1adcb87fd158c4e8e9) Git Hash: 512efd236cb1aeeac591b1e5701fb1fe26d91a22 Git Author: kib@FreeBSD.org ------------------------------------------------------------------------ r369503 | kib | 2021-03-21 10:56:52 -0700 (Sun, 21 Mar 2021) | 8 lines Add nameicap_cleanup_from(), to clean tracker list starting from some element Tested by: pho (cherry picked from commit e8a2862aa0384c75603f801625e309a3dae0ed05) Git Hash: 2cb05fff66929296444ee0ff5c1fcbb8419c54d9 Git Author: kib@FreeBSD.org ------------------------------------------------------------------------ r369504 | kib | 2021-03-21 10:56:54 -0700 (Sun, 21 Mar 2021) | 8 lines nameicap_check_dotdot: trim tracker on check Tested by: pho (cherry picked from commit 49c98a4bf3a87ace0df99056fa683805c1645e61) Git Hash: 45cc277b8522723bc75912fb68665767dadc45ac Git Author: kib@FreeBSD.org ------------------------------------------------------------------------ r369505 | kib | 2021-03-21 10:56:56 -0700 (Sun, 21 Mar 2021) | 8 lines O_RELATIVE_BENEATH: return ENOTCAPABLE instead of EINVAL for abs path Tested by: pho (cherry picked from commit 28cd3a673e0e32b009fd573764956b280d1affe1) Git Hash: 7d82c78725cf1769d68059b05f698737abcc8a1f Git Author: kib@FreeBSD.org ------------------------------------------------------------------------ r369506 | git2svn | 2021-03-22 14:49:43 -0700 (Mon, 22 Mar 2021) | 12 lines Drop EFI_STAGING_SIZE back down to 64M vmware can't cope with anything larger than 64MB. Drop this back to 64MB everywhere but arm. PR: 251866 MFC After: 1 week (cherry picked from commit 4d6047edb675e52b8fad57135ab3ded8e66d0dac) Git Hash: b304cd9789ca7ff3df629af42a976450e8660a11 Git Author: imp@FreeBSD.org ------------------------------------------------------------------------ r369507 | hselasky | 2021-03-23 04:48:42 -0700 (Tue, 23 Mar 2021) | 10 lines MFC c743a6bd4fc0: Implement mallocarray_domainset(9) variant of mallocarray(9). Reviewed by: kib @ Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit c743a6bd4fc0d1be30f9bc9996333ac0ba079563) Git Hash: 856415c36289a41826b565a97e3aa922e2412deb Git Author: hselasky@FreeBSD.org ------------------------------------------------------------------------ r369508 | hselasky | 2021-03-23 04:48:48 -0700 (Tue, 23 Mar 2021) | 12 lines MFC ebe5cf355dca: Implement basic support for allocating memory from a specific numa node in the LinuxKPI. Differential Revision: https://reviews.freebsd.org/D29077 Reviewed by: markj@ and kib@ Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit ebe5cf355dca1d7827a70b99a9d9c4f97f78691d) Git Hash: 1a12a42a9ac533c29cb4100ae2481e72d53d424a Git Author: hselasky@FreeBSD.org ------------------------------------------------------------------------ r369509 | hselasky | 2021-03-23 04:48:51 -0700 (Tue, 23 Mar 2021) | 10 lines MFC 6eb60f5b7f7d: Use the word "LinuxKPI" instead of "Linux compatibility", to not confuse with user-space Linux compatibility support. No functional change. Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit 6eb60f5b7f7df1a59de139260aebfa0aa5f6d79e) Git Hash: b880902e53d78b290c11ae0a2d4e7ecea7a508b6 Git Author: hselasky@FreeBSD.org ------------------------------------------------------------------------ r369510 | hselasky | 2021-03-23 04:48:54 -0700 (Tue, 23 Mar 2021) | 10 lines MFC d1cbe7908986: Allocating the LinuxKPI current structure from an interrupt thread must be done using the M_NOWAIT flag after 1ae20f7c70ea . Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit d1cbe79089868226625c12ef49f51214d79aa427) Git Hash: eab581fa61b535328ea525036c6e9a45bf54f474 Git Author: hselasky@FreeBSD.org ------------------------------------------------------------------------ r369511 | hselasky | 2021-03-23 04:48:57 -0700 (Tue, 23 Mar 2021) | 10 lines MFC dfb33cb0ef48: Allocating the LinuxKPI current structure from a software interrupt thread must be done using the M_NOWAIT flag after 1ae20f7c70ea . Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit dfb33cb0ef48084da84072244e8ca486dfcf3a96) Git Hash: af3a80bcdd204aaf9e9b7642cf81e4dfdb5a789e Git Author: hselasky@FreeBSD.org ------------------------------------------------------------------------ r369512 | kp | 2021-03-23 05:25:37 -0700 (Tue, 23 Mar 2021) | 18 lines pf: pool/kpool conversion code stuct pf_pool and struct pf_kpool are different. We should not simply bcopy() them. Happily it turns out that their differences were all pointers, and the userspace provided pointers were overwritten by the kernel, so this did actually work correctly, but we should fix it anyway. Reviewed by: glebius MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D29216 (cherry picked from commit 15b82e00a1640d1b9a1d720c95f65e580be30187) Git Hash: 961e7887b9bad9dd446a2289f3e5266ad2d122ef Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369513 | vmaffione | 2021-03-23 14:20:38 -0700 (Tue, 23 Mar 2021) | 14 lines netmap: fix issues in nm_os_extmem_create() - Call vm_object_reference() before vm_map_lookup_done(). - Use vm_mmap_to_errno() to convert vm_map_* return values to errno. - Fix memory leak of e->obj. Reported by: markj Reviewed by: markj MFC after: 1 week (cherry picked from commit ee7ffaa2e6e08b63efb4673610875d40964d5058) Git Hash: 610706f5e71a2805688cb3c13e8605675b58802c Git Author: vmaffione@FreeBSD.org ------------------------------------------------------------------------ r369515 | mav | 2021-03-23 18:28:57 -0700 (Tue, 23 Mar 2021) | 15 lines nvme: Replace potentially long DELAY() with pause(). In some cases like broken hardware nvme(4) may wait minutes for controller response before timeout. Doing so in a tight spin loop made whole system unresponsive. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D29309 Sponsored by: iXsystems, Inc. (cherry picked from commit 4fbbe523653b6d2a0186aca38224efcab941deaa) Git Hash: d00a723a2a5c1cd686fdab4b6d9c5084705d7182 Git Author: mav@FreeBSD.org ------------------------------------------------------------------------ r369516 | git2svn | 2021-03-24 01:01:57 -0700 (Wed, 24 Mar 2021) | 10 lines Implement pci_get_relaxed_ordering_enabled() helper function. Discussed with: kib@ MFC after: 1 week Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit 1acf24a044aaa0391c61af4abe7e018c3bf8a37c) Git Hash: 7cf565b2c5f0ed90eecd52b0fde8b81b746d662e Git Author: hselasky@FreeBSD.org ------------------------------------------------------------------------ r369518 | cy | 2021-03-24 02:00:37 -0700 (Wed, 24 Mar 2021) | 32 lines MFC eeb26cf52c4c51e1571253d57684c442aa79a98d: wpa: import fix for P2P provision discovery processing vulnerability Latest version available from: https://w1.fi/security/2021-1/ Vulnerability A vulnerability was discovered in how wpa_supplicant processes P2P (Wi-Fi Direct) provision discovery requests. Under a corner case condition, an invalid Provision Discovery Request frame could end up reaching a state where the oldest peer entry needs to be removed. With a suitably constructed invalid frame, this could result in use (read+write) of freed memory. This can result in an attacker within radio range of the device running P2P discovery being able to cause unexpected behavior, including termination of the wpa_supplicant process and potentially code execution. Vulnerable versions/configurations wpa_supplicant v1.0-v2.9 with CONFIG_P2P build option enabled An attacker (or a system controlled by the attacker) needs to be within radio range of the vulnerable system to send a set of suitably constructed management frames that trigger the corner case to be reached in the management of the P2P peer table. Note: FreeBSD base does not enable P2P. (cherry picked from commit eeb26cf52c4c51e1571253d57684c442aa79a98d) Git Hash: 3c2224758fc07c72da28c1a2359420c77e8e5d05 Git Author: cy@FreeBSD.org ------------------------------------------------------------------------ r369520 | markj | 2021-03-24 06:35:18 -0700 (Wed, 24 Mar 2021) | 18 lines rtsold: Fix validation of RDNSS options The header specifies the size of the option in multiples of eight bytes. The option consists of an eight-byte header followed by one or more IPv6 addresses, so the option is invalid if the size is not equal to 1+2n for some n>0. Check this. The bug can cause random stack data to be formatted as an IPv6 address and passed to resolvconf(8), but a host able to trigger the bug may also specify arbitrary addresses this way. Reported by: Q C Sponsored by: The FreeBSD Foundation (cherry picked from commit 1af332a7d8f86b6fcc1f0f575fe5b06021b54f4c) Git Hash: 7df4b83b80bc6e90a53acae60d69ce319ea05b65 Git Author: markj@FreeBSD.org ------------------------------------------------------------------------ r369521 | jkim | 2021-03-25 10:14:46 -0700 (Thu, 25 Mar 2021) | 8 lines OpenSSL: Merge OpenSSL 1.1.1k Merge commit '94fa08a4bcdfbb3434b025d67d014af3b18e5380' (cherry picked from commit b6c1fdcdf5033d20c61cc77d66f58f31cc65e2ba) Git Hash: 18d07050e60ecc738556f0de56e34817303371a4 Git Author: jkim@FreeBSD.org ------------------------------------------------------------------------ r369522 | git2svn | 2021-03-25 10:15:16 -0700 (Thu, 25 Mar 2021) | 6 lines OpenSSL: Regen manual pages for 1.1.1k (cherry picked from commit 7595394130a163b7ff53d9ef3f28fcb87f629d17) Git Hash: 2225c9780afa0f02f02a69b78f9e9bc2f0ac18bc Git Author: jkim@FreeBSD.org ------------------------------------------------------------------------ r369524 | git2svn | 2021-03-27 14:09:11 -0700 (Sat, 27 Mar 2021) | 21 lines mountd(8): generate a syslog message when the "V4:" line is missing Daniel reported that NFSv4 mounts were not working despite having set "nfsv4_server_enable=YES" in /etc/rc.conf. Mountd was logging a message that there was no /etc/exports file. He noted that creating a /etc/exports file with a "V4:" line in it was needed make NFSv4 mounts work. At least one "V4:" line in one of the exports(5) file(s) is needed to make NFSv4 mounts work. This patch fixes mountd.c so that it logs a message indicting that there is no "V4:" line in any exports(5) file when NFSv4 mounts are enabled. To avoid this message being generated erroneously, /etc/rc.d/mountd is updated to make sure vfs.nfsd.server_max_nfsvers is properly set before mountd(8) is started. PR: 253901 (cherry picked from commit 09673fc0f36dd1cca74940a240a9ed0f62228084) Git Hash: 5cc4e912e031c717e6ee6c2a0fd92137cc2dcefc Git Author: rmacklem@FreeBSD.org ------------------------------------------------------------------------ r369525 | git2svn | 2021-03-27 17:26:49 -0700 (Sat, 27 Mar 2021) | 18 lines accept_filter: Fix filter parameter handling For filters which implement accf_create, the setsockopt(2) handler caches the filter name in the socket, but it also incorrectly frees the buffer containing the copy, leaving a dangling pointer. Note that no accept filters provided in the base system are susceptible to this, as they don't implement accf_create. Reported by: Alexey Kulaev Discussed with: emaste Security: kernel use-after-free MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 653a437c04440495cd8e7712c7cf39444f26f1ee) Git Hash: 6008a5fad3c110c4ec03cc3fe60ce41c4e548b98 Git Author: markj@FreeBSD.org ------------------------------------------------------------------------ r369526 | whu | 2021-03-29 01:55:40 -0700 (Mon, 29 Mar 2021) | 14 lines Hyper-V: hn: Store host hash value in flowid When rx packet contains hash value sent from host, store it in the mbuf's flowid field so when the same mbuf is on the tx path, the hash value can be used by the host to determine the outgoing network queue. MFC after: 2 weeks Sponsored by: Microsoft (cherry picked from commit 80f39bd95f22322152709ea5fae3a3c546044c9c) Git Hash: 1aadba9cc8af4c1925eb27215eaf6d68e6fbf4d8 Git Author: whu@FreeBSD.org ------------------------------------------------------------------------ r369527 | whu | 2021-03-29 02:13:16 -0700 (Mon, 29 Mar 2021) | 19 lines Hyper-V: hn: Enable vSwitch RSC support in hn netvsc driver Receive Segment Coalescing (RSC) in the vSwitch is a feature available in Windows Server 2019 hosts and later. It reduces the per packet processing overhead by coalescing multiple TCP segments when possible. This happens mostly when TCP traffics are among different guests on same host. This patch adds netvsc driver support for this feature. The patch also updates NVS version to 6.1 as needed for RSC enablement. MFC after: 2 weeks Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D29075 (cherry picked from commit a491581f3f8df07cdff0236bd556895205929af4) Git Hash: 4150446f6467f585595803db211f58152cd3587a Git Author: whu@FreeBSD.org ------------------------------------------------------------------------ r369528 | whu | 2021-03-29 02:17:03 -0700 (Mon, 29 Mar 2021) | 17 lines Hyper-V: hn: Initialize the internal field of per packet info on tx path The RSC support feature introduced a bit field "rm_internal" in struct rndis_pktinfo with total size unchanged. The guest does not use this field in the tx path. However we need to initialize it to zero in case older hosts which are not aware of this field. Fixes: a491581f ("Hyper-V: hn: Enable vSwitch RSC support") MFC after: 2 weeks Sponsored by: Microsoft (cherry picked from commit 805dbff6c36a6cd84491aa53a02315fa025734cc) Git Hash: 2a321939b02bbf6123ba029f1967778c10538fe6 Git Author: whu@FreeBSD.org ------------------------------------------------------------------------ r369529 | git2svn | 2021-03-29 09:16:09 -0700 (Mon, 29 Mar 2021) | 23 lines align nfsdumpstate column output There are scenarios where an NFS client will mount an NFSv4 export without specifying a callback address. When running nfsdumpstate under this circumstance, the column output is shifted incorrectly which places the "ClientID" value underneath the "Clientaddr" column. This diff is a small cosmetic change that prints a blank in the "Clientaddr" column and ensures the data for the columns are aligned appropriately. Submitted by: Caleb St. John Reviewed by: sef (previous version) MFC after: 3 days Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D18958 (cherry picked from commit efad9c8ba3cec7f6e39b128b90afab70701fd8d9) Git Hash: 57593b2bca76db683ec6c589c1b051132181d55b Git Author: yocalebo@gmail.com ------------------------------------------------------------------------ r369530 | freqlabs | 2021-03-29 09:16:20 -0700 (Mon, 29 Mar 2021) | 19 lines rpc.lockd: Unconditionally close fds as daemon When lockd is configured with a debug level of > 0 and foreground == 0, the process is daemonized with a truth noclose argument to daemon(). This doesn't seem to be the desired behavior because that prevents stdout and stderr from being closed, however, stdout and stderr aren't used anywhere else. Furthermore, the man pages state that with a higher debug level it will use the syslog facilities to do so. Submitted by: Caleb St. John Discussed with: rmacklem MFC after: 3 days Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D29415 (cherry picked from commit badcfbacf3840a4097bb79192054481c7674e7d2) Git Hash: 4fd5354e85e4e72b91e7690595173b3bbde21490 Git Author: yocalebo@gmail.com ------------------------------------------------------------------------ r369532 | git2svn | 2021-03-31 06:14:41 -0700 (Wed, 31 Mar 2021) | 14 lines pfsync: Unconditionally push packets when requesting state updates When we request a bulk sync we need to ensure we actually send out that request, not just buffer it until we have enough data to send a full packet. PR: 254236 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D29271 (cherry picked from commit 9f2e5184173f6af70306678b018270df9a9600f2) Git Hash: aab309b4134a1822fab48d799580e4afdf90ac4a Git Author: topical@gmx.net ------------------------------------------------------------------------ r369533 | kp | 2021-03-31 06:14:46 -0700 (Wed, 31 Mar 2021) | 15 lines pf tests: pfsync bulk update test Test that pfsync works as expected with bulk updates. That is, create some state before setting up the second firewall. Let that firewall request a bulk update so it can catch up, and check that it got the state which was created before it enable pfsync. PR: 254236 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D29272 (cherry picked from commit 8ad7d25dfc808ca00300f7553a9b28dfc0e99c18) Git Hash: f8d706fdd106f94ca048d809d504fef651d4a23e Git Author: kp@FreeBSD.org ------------------------------------------------------------------------ r369534 | markj | 2021-03-31 06:23:04 -0700 (Wed, 31 Mar 2021) | 14 lines Fix several dev_clone callbacks to avoid out-of-bounds reads Use strncmp() instead of bcmp(), so that we don't have to find the minimum of the string lengths before comparing. Reviewed by: kib Reported by: KASAN Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29463 (cherry picked from commit 3428b6c050d102ba7f95514b29f4f5685d76b645) Git Hash: f9fcb518e7289489d8fc577565f21f95a51a33cd Git Author: markj@FreeBSD.org ------------------------------------------------------------------------ r369535 | markj | 2021-03-31 06:23:08 -0700 (Wed, 31 Mar 2021) | 8 lines amd64: Make KPDPphys local to pmap.c Sponsored by: The FreeBSD Foundation (cherry picked from commit 7ae2e703366e5ac56373509ececae53ecaa5bc59) Git Hash: 9be66886747651104235642e457b23b7fa090cb0 Git Author: markj@FreeBSD.org ------------------------------------------------------------------------