Pull up following revision(s) (requested by riastradh in ticket #376):
libexec/ld.elf_so/load.c: revision 1.52
rtld, ldd: Fix bad assertion.
(*needed)->obj may legitimately be null here, as the next line shows,
so don't check (*needed)->obj->refcount in that case.
PR bin/60422: ldd, rtld: crash inside assertion if needed object not
found
Pull up the following revisions(s) (requested by msaitoh in ticket #1310):
usr.sbin/syslogd/extern.h: revision 1.5
usr.sbin/syslogd/sign.c: revision 1.10
usr.sbin/syslogd/sign.h: revision 1.4
usr.sbin/syslogd/syslogd.c: revision 1.141,1.145,1.148,1.151-1.155 via patch
usr.sbin/syslogd/syslogd.h: revision 1.10-1.11 via patch
usr.sbin/syslogd/tls.c: revision 1.26-1.27
usr.sbin/syslogd/tls.h: revision 1.4
Some improvements for syslogd(8):
- Retry sendto() if it raises EBUSY, too.
- Add missing SLIST_INIT() in main(). This is not a real bug because
the tls_opt is in BSS and SLIST_INIT() assign NULL.
- Cleanups (KNF, fix typos and G.C.).
Pull up the following revisions(s) (requested by riastradh in ticket #374):
sys/dev/acpi/acpi_mcfg.c: revision 1.33
x86: Fix crash at boot on some machines with options PCI_RESOURCE,
in case something goes wrong traversing the MCFG table and no
segments are found.
Addresses:
PR kern/60411: x86 PCI_RESOURCE: null pointer dereference at boot
rtld, ldd: Fix bad assertion.
(*needed)->obj may legitimately be null here, as the next line shows,
so don't check (*needed)->obj->refcount in that case.
PR bin/60422: ldd, rtld: crash inside assertion if needed object not
found
Pull up the following revisions(s) (requested by riastradh in ticket #373):
lib/libc/citrus/modules/citrus_viqr.c: revision 1.10
lib/libc/citrus/modules/citrus_iconv_std.c: revision 1.18
iconv(3): Fix use-after-free in VIQR encoding, and incorrect
mbstate_t allocation alignment in various encodings (triggerable
if the source is VIQR).
Fixes:
- PR lib/59019: various iconv issues
- PR lib/60413: iconv_samples test crashes on sparc*
Pull up the following revisions(s) (requested by msaitoh in ticket #370):
usr.sbin/syslogd/extern.h: revision 1.5
usr.sbin/syslogd/sign.c: revision 1.10
usr.sbin/syslogd/sign.h: revision 1.4
usr.sbin/syslogd/syslogd.c: revision 1.151-1.155
usr.sbin/syslogd/syslogd.h: revision 1.10-1.11
usr.sbin/syslogd/tls.h: revision 1.4
usr.sbin/syslogd/tls.c: revision 1.26-1.27
Some improvements for syslogd(8):
- Retry sendto() if it raises EBUSY, too.
- Add missing SLIST_INIT() in main(). This is not a real bug because
the tls_opt is in BSS and SLIST_INIT() assign NULL.
- Cleanups (KNF, fix typos and G.C.).
Pull up the following revisions(s) (requested by msaitoh in ticket #369):
usr.sbin/syslogd/tls.c: revision 1.22-1.25
syslogd: Fix memory leak in match_certfile().
Use X509_free() to deallocate certfile data in init_global_TLS_CTX().
Fix mem-leak of match_hostname(). ASN1_OCTET_STRING must be deallocated.
Fix memory-leak during tls_send().
Found and fixed by Masakazu OOHASHI at IIJ.
Pull up the following revisions(s) (requested by msaitoh in ticket #368):
usr.sbin/syslogd/syslogd.c: revision 1.149-1.150
syslogd: Fix a bug that tls_ca mistakenly matches tls_cadir.
syslogd: Fix incorrect comparison in buf_queue_obj_size()