CVS commit: src/sys/netinet
Module Name:src
Committed By: ozaki-r
Date: Wed Apr 19 02:43:40 UTC 2023
Modified Files:
src/sys/netinet: ip_output.c
Log Message:
Revert "Fix panic on packet sending via a route with rt_ifa of AF_LINK."
The fix is mistakenly upstreamed.
To generate a diff of this commit:
cvs rdiff -u -r1.324 -r1.325 src/sys/netinet/ip_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.324 src/sys/netinet/ip_output.c:1.325
--- src/sys/netinet/ip_output.c:1.324 Mon Nov 21 09:51:13 2022
+++ src/sys/netinet/ip_output.c Wed Apr 19 02:43:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.324 2022/11/21 09:51:13 knakahara Exp $ */
+/* $NetBSD: ip_output.c,v 1.325 2023/04/19 02:43:40 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.324 2022/11/21 09:51:13 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.325 2023/04/19 02:43:40 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -531,15 +531,6 @@ ip_output(struct mbuf *m0, struct mbuf *
if (in_nullhost(ip->ip_src)) {
struct ifaddr *xifa;
- /* If rt_ifa is AF_LINK, ia can be NULL. */
- if (ia == NULL) {
- KASSERTMSG(rt->rt_ifa->ifa_addr->sa_family == AF_LINK,
- "sa_family=%d", rt->rt_ifa->ifa_addr->sa_family);
- IP_STATINC(IP_STAT_NOROUTE);
- error = EHOSTUNREACH;
- goto bad;
- }
-
xifa = >ia_ifa;
if (xifa->ifa_getifa != NULL) {
ia4_release(ia, _ia);
@@ -591,15 +582,6 @@ ip_output(struct mbuf *m0, struct mbuf *
sendit:
if ((flags & (IP_FORWARDING|IP_NOIPNEWID)) == 0) {
- /* If rt_ifa is AF_LINK, ia can be NULL. */
- if (ia == NULL) {
- KASSERTMSG(rt->rt_ifa->ifa_addr->sa_family == AF_LINK,
- "sa_family=%d", rt->rt_ifa->ifa_addr->sa_family);
- IP_STATINC(IP_STAT_NOROUTE);
- error = EHOSTUNREACH;
- goto bad;
- }
-
if (m->m_pkthdr.len < IP_MINFRAGSIZE) {
ip->ip_id = 0;
} else if ((m->m_pkthdr.csum_flags & M_CSUM_TSOv4) == 0) {
CVS commit: src/sys/netinet
Module Name:src Committed By: ozaki-r Date: Wed Apr 19 02:43:40 UTC 2023 Modified Files: src/sys/netinet: ip_output.c Log Message: Revert "Fix panic on packet sending via a route with rt_ifa of AF_LINK." The fix is mistakenly upstreamed. To generate a diff of this commit: cvs rdiff -u -r1.324 -r1.325 src/sys/netinet/ip_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: yamaguchi Date: Wed Apr 19 00:40:30 UTC 2023 Modified Files: src/sys/dev/pci: virtio.c Log Message: virtio(4): change variable name, nfc To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/virtio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: yamaguchi
Date: Wed Apr 19 00:40:30 UTC 2023
Modified Files:
src/sys/dev/pci: virtio.c
Log Message:
virtio(4): change variable name, nfc
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/virtio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.76 src/sys/dev/pci/virtio.c:1.77
--- src/sys/dev/pci/virtio.c:1.76 Wed Apr 19 00:38:30 2023
+++ src/sys/dev/pci/virtio.c Wed Apr 19 00:40:30 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.76 2023/04/19 00:38:30 yamaguchi Exp $ */
+/* $NetBSD: virtio.c,v 1.77 2023/04/19 00:40:30 yamaguchi Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.76 2023/04/19 00:38:30 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.77 2023/04/19 00:40:30 yamaguchi Exp $");
#include
#include
@@ -944,12 +944,12 @@ vq_alloc_slot_locked(struct virtio_softc
size_t nslots)
{
struct vring_desc *vd;
- uint16_t rv, tail;
+ uint16_t head, tail;
size_t i;
KASSERT(mutex_owned(>vq_freedesc_lock));
- tail = virtio_rw16(sc, vq->vq_free_idx);
+ head = tail = virtio_rw16(sc, vq->vq_free_idx);
for (i = 0; i < nslots - 1; i++) {
if (tail == VRING_DESC_CHAIN_END)
return VRING_DESC_CHAIN_END;
@@ -962,13 +962,11 @@ vq_alloc_slot_locked(struct virtio_softc
if (tail == VRING_DESC_CHAIN_END)
return VRING_DESC_CHAIN_END;
- rv = virtio_rw16(sc, vq->vq_free_idx);
-
vd = >vq_desc[tail];
vd->flags = virtio_rw16(sc, 0);
vq->vq_free_idx = vd->next;
- return rv;
+ return head;
}
static uint16_t
vq_alloc_slot(struct virtio_softc *sc, struct virtqueue *vq, size_t nslots)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: yamaguchi
Date: Wed Apr 19 00:38:30 UTC 2023
Modified Files:
src/sys/dev/pci: virtio.c
Log Message:
Fix not to allocate unnecessary descriptor
fixes PR/57358
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/virtio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.75 src/sys/dev/pci/virtio.c:1.76
--- src/sys/dev/pci/virtio.c:1.75 Wed Apr 19 00:23:45 2023
+++ src/sys/dev/pci/virtio.c Wed Apr 19 00:38:30 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.75 2023/04/19 00:23:45 yamaguchi Exp $ */
+/* $NetBSD: virtio.c,v 1.76 2023/04/19 00:38:30 yamaguchi Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.75 2023/04/19 00:23:45 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.76 2023/04/19 00:38:30 yamaguchi Exp $");
#include
#include
@@ -1096,17 +1096,18 @@ virtio_enqueue_reserve(struct virtio_sof
}
vd[i].flags = virtio_rw16(sc, 0);
} else {
- uint16_t s;
+ if (nsegs > 1) {
+ uint16_t s;
- s = vq_alloc_slot(sc, vq, nsegs - 1);
- if (s == VRING_DESC_CHAIN_END) {
- vq_free_slot(sc, vq, slot);
- return EAGAIN;
+ s = vq_alloc_slot(sc, vq, nsegs - 1);
+ if (s == VRING_DESC_CHAIN_END) {
+vq_free_slot(sc, vq, slot);
+return EAGAIN;
+ }
+ vd->next = virtio_rw16(sc, s);
+ vd->flags = virtio_rw16(sc, VRING_DESC_F_NEXT);
}
- vd->next = virtio_rw16(sc, s);
- vd->flags = virtio_rw16(sc, VRING_DESC_F_NEXT);
-
vdx->desc_base = >vq_desc[0];
vdx->desc_free_idx = slot;
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: yamaguchi Date: Wed Apr 19 00:38:30 UTC 2023 Modified Files: src/sys/dev/pci: virtio.c Log Message: Fix not to allocate unnecessary descriptor fixes PR/57358 To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/virtio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src
Committed By: yamaguchi
Date: Wed Apr 19 00:23:45 UTC 2023
Modified Files:
src/sys/dev/pci: virtio.c virtio_pci.c virtiovar.h
src/sys/dev/virtio: virtio_mmio.c
Log Message:
Use enumeration for state of a child driver instead of flags
and check its detaching by using sc->sc_child in virtio_softc
pointed out by riastradh, thanks.
fixes PR/57357
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/virtio.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/virtio_pci.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/virtiovar.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/virtio/virtio_mmio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.74 src/sys/dev/pci/virtio.c:1.75
--- src/sys/dev/pci/virtio.c:1.74 Fri Mar 31 07:34:26 2023
+++ src/sys/dev/pci/virtio.c Wed Apr 19 00:23:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.74 2023/03/31 07:34:26 yamaguchi Exp $ */
+/* $NetBSD: virtio.c,v 1.75 2023/04/19 00:23:45 yamaguchi Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.74 2023/03/31 07:34:26 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.75 2023/04/19 00:23:45 yamaguchi Exp $");
#include
#include
@@ -1328,7 +1328,7 @@ virtio_child_attach_start(struct virtio_
char buf[1024];
KASSERT(sc->sc_child == NULL);
- KASSERT(!ISSET(sc->sc_child_flags, VIRTIO_CHILD_DETACHED));
+ KASSERT(sc->sc_child_state == VIRTIO_NO_CHILD);
sc->sc_child = child;
sc->sc_ipl = ipl;
@@ -1404,7 +1404,7 @@ virtio_child_attach_finish(struct virtio
}
}
- SET(sc->sc_child_flags, VIRTIO_CHILD_ATTACH_FINISHED);
+ sc->sc_child_state = VIRTIO_CHILD_ATTACH_FINISHED;
virtio_set_status(sc, VIRTIO_CONFIG_DEVICE_STATUS_DRIVER_OK);
return 0;
@@ -1425,10 +1425,9 @@ virtio_child_detach(struct virtio_softc
{
/* already detached */
- if (ISSET(sc->sc_child_flags, VIRTIO_CHILD_DETACHED))
+ if (sc->sc_child == NULL)
return;
- sc->sc_vqs = NULL;
virtio_device_reset(sc);
@@ -1439,7 +1438,8 @@ virtio_child_detach(struct virtio_softc
sc->sc_soft_ih = NULL;
}
- SET(sc->sc_child_flags, VIRTIO_CHILD_DETACHED);
+ sc->sc_vqs = NULL;
+ sc->sc_child = NULL;
}
void
@@ -1449,7 +1449,7 @@ virtio_child_attach_failed(struct virtio
virtio_set_status(sc, VIRTIO_CONFIG_DEVICE_STATUS_FAILED);
- SET(sc->sc_child_flags, VIRTIO_CHILD_ATTACH_FAILED);
+ sc->sc_child_state = VIRTIO_CHILD_ATTACH_FAILED;
}
bus_dma_tag_t
@@ -1485,19 +1485,29 @@ virtio_attach_failed(struct virtio_softc
if (sc->sc_childdevid == 0)
return 1;
- if (ISSET(sc->sc_child_flags, VIRTIO_CHILD_ATTACH_FAILED)) {
- aprint_error_dev(self, "virtio configuration failed\n");
- return 1;
- }
-
if (sc->sc_child == NULL) {
- aprint_error_dev(self,
- "no matching child driver; not configured\n");
+ switch (sc->sc_child_state) {
+ case VIRTIO_CHILD_ATTACH_FAILED:
+ aprint_error_dev(self,
+ "virtio configuration failed\n");
+ break;
+ case VIRTIO_NO_CHILD:
+ aprint_error_dev(self,
+ "no matching child driver; not configured\n");
+ break;
+ default:
+ /* sanity check */
+ aprint_error_dev(self,
+ "virtio internal error, "
+ "child driver is not configured\n");
+ break;
+ }
+
return 1;
}
/* sanity check */
- if (!ISSET(sc->sc_child_flags, VIRTIO_CHILD_ATTACH_FINISHED)) {
+ if (sc->sc_child_state != VIRTIO_CHILD_ATTACH_FINISHED) {
aprint_error_dev(self, "virtio internal error, child driver "
"signaled OK but didn't initialize interrupts\n");
return 1;
Index: src/sys/dev/pci/virtio_pci.c
diff -u src/sys/dev/pci/virtio_pci.c:1.41 src/sys/dev/pci/virtio_pci.c:1.42
--- src/sys/dev/pci/virtio_pci.c:1.41 Sun Apr 16 17:57:08 2023
+++ src/sys/dev/pci/virtio_pci.c Wed Apr 19 00:23:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_pci.c,v 1.41 2023/04/16 17:57:08 riastradh Exp $ */
+/* $NetBSD: virtio_pci.c,v 1.42 2023/04/19 00:23:45 yamaguchi Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.41 2023/04/16 17:57:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.42 2023/04/19 00:23:45 yamaguchi Exp $");
#include
#include
@@ -334,10 +334,7 @@ virtio_pci_detach(device_t self, int fla
return r;
/* Check that child never attached, or detached properly */
- KASSERTMSG(!ISSET(sc->sc_child_flags,
- (VIRTIO_CHILD_ATTACH_FINISHED|VIRTIO_CHILD_ATTACH_FAILED)) ||
- ISSET(sc->sc_child_flags, VIRTIO_CHILD_DETACHED),
- "%s: child flags %x", device_xname(self), sc->sc_child_flags);
+ KASSERT(sc->sc_child == NULL);
KASSERT(sc->sc_vqs == NULL);
KASSERT(psc->sc_ihs_num == 0);
Index: src/sys/dev/pci/virtiovar.h
diff -u src/sys/dev/pci/virtiovar.h:1.28
CVS commit: src/sys/dev
Module Name:src Committed By: yamaguchi Date: Wed Apr 19 00:23:45 UTC 2023 Modified Files: src/sys/dev/pci: virtio.c virtio_pci.c virtiovar.h src/sys/dev/virtio: virtio_mmio.c Log Message: Use enumeration for state of a child driver instead of flags and check its detaching by using sc->sc_child in virtio_softc pointed out by riastradh, thanks. fixes PR/57357 To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/virtio.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/virtio_pci.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/virtiovar.h cvs rdiff -u -r1.9 -r1.10 src/sys/dev/virtio/virtio_mmio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Tue Apr 18 23:05:51 UTC 2023 Modified Files: src/usr.sbin/makefs: cd9660.c Log Message: Move date setting into cd9660_populate_iso_dir_record so there is no path that leaves it unset. >From FreeBSD https://reviews.freebsd.org/D39258 To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/makefs/cd9660.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Tue Apr 18 23:05:51 UTC 2023
Modified Files:
src/usr.sbin/makefs: cd9660.c
Log Message:
Move date setting into cd9660_populate_iso_dir_record so there is no
path that leaves it unset.
>From FreeBSD https://reviews.freebsd.org/D39258
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/makefs/cd9660.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/cd9660.c
diff -u src/usr.sbin/makefs/cd9660.c:1.58 src/usr.sbin/makefs/cd9660.c:1.59
--- src/usr.sbin/makefs/cd9660.c:1.58 Tue Dec 21 16:28:31 2021
+++ src/usr.sbin/makefs/cd9660.c Tue Apr 18 19:05:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.c,v 1.58 2021/12/21 21:28:31 andvar Exp $ */
+/* $NetBSD: cd9660.c,v 1.59 2023/04/18 23:05:51 christos Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -103,7 +103,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.58 2021/12/21 21:28:31 andvar Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.59 2023/04/18 23:05:51 christos Exp $");
#endif /* !__lint */
#include
@@ -737,7 +737,10 @@ cd9660_populate_iso_dir_record(struct _i
u_char ext_attr_length, u_char flags,
u_char name_len, const char * name)
{
+ time_t tstamp = stampst.st_ino ? stampst.st_mtime : time(NULL);
+
record->ext_attr_length[0] = ext_attr_length;
+ cd9660_time_915(record->date, tstamp);
record->flags[0] = ISO_FLAG_CLEAR | flags;
record->file_unit_size[0] = 0;
record->interleave[0] = 0;
@@ -824,7 +827,6 @@ cd9660_fill_extended_attribute_record(cd
static int
cd9660_translate_node_common(iso9660_disk *diskStructure, cd9660node *newnode)
{
- time_t tstamp = stampst.st_ino ? stampst.st_mtime : time(NULL);
u_char flag;
char temp[ISO_FILENAME_MAXLENGTH_WITH_PADDING];
@@ -841,12 +843,6 @@ cd9660_translate_node_common(iso9660_dis
cd9660_populate_iso_dir_record(newnode->isoDirRecord, 0,
flag, strlen(temp), temp);
- /* Set the various dates */
-
- /* If we want to use the current date and time */
-
- cd9660_time_915(newnode->isoDirRecord->date, tstamp);
-
cd9660_bothendian_dword(newnode->fileDataLength,
newnode->isoDirRecord->size);
/* If the file is a link, we want to set the size to 0 */
CVS commit: src/usr.sbin/makefs/cd9660
Module Name:src Committed By: christos Date: Tue Apr 18 23:02:51 UTC 2023 Modified Files: src/usr.sbin/makefs/cd9660: iso9660_rrip.c Log Message: We previously attempted to emit Rock Ridge NM records only when the name represented by the Rock Ridge extensions would actually differ. We would omit the record for an all-upper-case directory name, however Linux (and perhaps other operating systems) map names with no NM record to lowercase. This affected only directories, as file names have an implicit ";1" version number appended and thus always differ. To solve, just emit NM records for all entries other than DOT and DOTDOT . We could continue to omit the NM record for directories that would avoid mapping (for example, one named 1234.567) but this does not seem worth the complexity. >From FreeBSD https://reviews.freebsd.org/D39258 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/makefs/cd9660/iso9660_rrip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs/cd9660
Module Name:src
Committed By: christos
Date: Tue Apr 18 23:00:02 UTC 2023
Modified Files:
src/usr.sbin/makefs/cd9660: cd9660_eltorito.c
Log Message:
The boot catalog pointer is a DWord, but we previously populated it via
cd9660_bothendian_dword which overwrote four unused bytes following it.
See El Torito 1.0 (1995) Figure 7 for details.
Found by Coverity on FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/cd9660/cd9660_eltorito.c
diff -u src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.25 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.26
--- src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.25 Sat Apr 9 06:05:35 2022
+++ src/usr.sbin/makefs/cd9660/cd9660_eltorito.c Tue Apr 18 19:00:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_eltorito.c,v 1.25 2022/04/09 10:05:35 riastradh Exp $ */
+/* $NetBSD: cd9660_eltorito.c,v 1.26 2023/04/18 23:00:02 christos Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -40,7 +40,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660_eltorito.c,v 1.25 2022/04/09 10:05:35 riastradh Exp $");
+__RCSID("$NetBSD: cd9660_eltorito.c,v 1.26 2023/04/18 23:00:02 christos Exp $");
#endif /* !__lint */
#ifdef DEBUG
@@ -377,8 +377,8 @@ cd9660_setup_boot(iso9660_disk *diskStru
/* Point to catalog: For now assume it consumes one sector */
ELTORITO_DPRINTF(("Boot catalog will go in sector %d\n", first_sector));
diskStructure->boot_catalog_sector = first_sector;
- cd9660_bothendian_dword(first_sector,
- diskStructure->boot_descriptor->boot_catalog_pointer);
+ cd9660_731(first_sector,
+ diskStructure->boot_descriptor->boot_catalog_pointer);
/*
* Use system type of default image for validation entry. Fallback to
CVS commit: src/usr.sbin/makefs/cd9660
Module Name:src Committed By: christos Date: Tue Apr 18 23:00:02 UTC 2023 Modified Files: src/usr.sbin/makefs/cd9660: cd9660_eltorito.c Log Message: The boot catalog pointer is a DWord, but we previously populated it via cd9660_bothendian_dword which overwrote four unused bytes following it. See El Torito 1.0 (1995) Figure 7 for details. Found by Coverity on FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs/cd9660
Module Name:src Committed By: christos Date: Tue Apr 18 22:58:14 UTC 2023 Modified Files: src/usr.sbin/makefs/cd9660: iso9660_rrip.h Log Message: See RRIP 4.1.4 Description of the "NM" System Use Entry for details. >From FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/cd9660/iso9660_rrip.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/makefs/cd9660/iso9660_rrip.h diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.h:1.7 src/usr.sbin/makefs/cd9660/iso9660_rrip.h:1.8 --- src/usr.sbin/makefs/cd9660/iso9660_rrip.h:1.7 Tue Apr 18 18:56:41 2023 +++ src/usr.sbin/makefs/cd9660/iso9660_rrip.h Tue Apr 18 18:58:14 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: iso9660_rrip.h,v 1.7 2023/04/18 22:56:41 christos Exp $ */ +/* $NetBSD: iso9660_rrip.h,v 1.8 2023/04/18 22:58:14 christos Exp $ */ /* * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan @@ -58,9 +58,9 @@ #define TF_EFFECTIVE 0x40 #define TF_LONGFORM 0x80 -#define NM_CONTINUE 0x80 -#define NM_CURRENT 0x100 -#define NM_PARENT 0x200 +#define NM_CONTINUE 0x01 +#define NM_CURRENT 0x02 +#define NM_PARENT 0x04 #define SUSP_LOC_ENTRY 0x01
CVS commit: src/usr.sbin/makefs/cd9660
Module Name:src Committed By: christos Date: Tue Apr 18 22:58:14 UTC 2023 Modified Files: src/usr.sbin/makefs/cd9660: iso9660_rrip.h Log Message: See RRIP 4.1.4 Description of the "NM" System Use Entry for details. >From FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makefs/cd9660/iso9660_rrip.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/mit/lua/dist/src
Thanks! rin On 2023/04/18 22:53, Nikita Ronja Gillmann wrote: Hi, okay. I'll add them for now as notes in one of the README files in the lua directory. Rin Okuyama transcribed 0.4K bytes: Hello again, On 2023/04/18 4:16, Nikita wrote: Module Name: src Committed By: nikita Date: Mon Apr 17 19:16:38 UTC 2023 Modified Files: src/external/mit/lua/dist/src: lua.c Log Message: lua: Apply upstream bugfix for "lua.c assumes that argv has at least one element." Upstream commit number, and URL for the commit on web interface of VCS must be very helpful for us. Thanks, rin
CVS commit: src/usr.sbin/makefs/cd9660
Module Name:src Committed By: christos Date: Tue Apr 18 22:56:41 UTC 2023 Modified Files: src/usr.sbin/makefs/cd9660: iso9660_rrip.c iso9660_rrip.h Log Message: The bit definitions for the TF_* timestamp bits (TF_MODIFY, etc.) were incorrect, and timestamps were written in the wrong order. See RRIP 4.1.6 Description of the "TF" System Use Entry for details. From: https://reviews.freebsd.org/D39221 To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/makefs/cd9660/iso9660_rrip.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/makefs/cd9660/iso9660_rrip.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs/cd9660
Module Name:src
Committed By: christos
Date: Tue Apr 18 22:56:41 UTC 2023
Modified Files:
src/usr.sbin/makefs/cd9660: iso9660_rrip.c iso9660_rrip.h
Log Message:
The bit definitions for the TF_* timestamp bits (TF_MODIFY, etc.) were
incorrect, and timestamps were written in the wrong order.
See RRIP 4.1.6 Description of the "TF" System Use Entry for details.
From: https://reviews.freebsd.org/D39221
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/makefs/cd9660/iso9660_rrip.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/makefs/cd9660/iso9660_rrip.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/cd9660/iso9660_rrip.c
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.14 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.15
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.14 Fri May 30 09:14:47 2014
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c Tue Apr 18 18:56:41 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iso9660_rrip.c,v 1.14 2014/05/30 13:14:47 martin Exp $ */
+/* $NetBSD: iso9660_rrip.c,v 1.15 2023/04/18 22:56:41 christos Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -44,7 +44,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: iso9660_rrip.c,v 1.14 2014/05/30 13:14:47 martin Exp $");
+__RCSID("$NetBSD: iso9660_rrip.c,v 1.15 2023/04/18 22:56:41 christos Exp $");
#endif /* !__lint */
static void cd9660_rrip_initialize_inode(cd9660node *);
@@ -697,11 +697,11 @@ cd9660node_rrip_tf(struct ISO_SUSP_ATTRI
*/
cd9660_time_915(p->attr.rr_entry.TF.timestamp,
- _node->inode->st.st_atime);
+ _node->inode->st.st_mtime);
p->attr.rr_entry.TF.h.length[0] += 7;
cd9660_time_915(p->attr.rr_entry.TF.timestamp + 7,
- _node->inode->st.st_mtime);
+ _node->inode->st.st_atime);
p->attr.rr_entry.TF.h.length[0] += 7;
cd9660_time_915(p->attr.rr_entry.TF.timestamp + 14,
Index: src/usr.sbin/makefs/cd9660/iso9660_rrip.h
diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.h:1.6 src/usr.sbin/makefs/cd9660/iso9660_rrip.h:1.7
--- src/usr.sbin/makefs/cd9660/iso9660_rrip.h:1.6 Mon Jan 28 16:03:28 2013
+++ src/usr.sbin/makefs/cd9660/iso9660_rrip.h Tue Apr 18 18:56:41 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iso9660_rrip.h,v 1.6 2013/01/28 21:03:28 christos Exp $ */
+/* $NetBSD: iso9660_rrip.h,v 1.7 2023/04/18 22:56:41 christos Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -48,15 +48,17 @@
#define PX_LENGTH 0x2C
#define PN_LENGTH 0x14
-#define TF_CREATION 0x00
-#define TF_MODIFY 0x01
-#define TF_ACCESS 0x02
-#define TF_ATTRIBUTES 0x04
-#define TF_BACKUP 0x08
-#define TF_EXPIRATION 0x10
-#define TF_EFFECTIVE 0x20
-#define TF_LONGFORM 0x40
-#define NM_CONTINUE 0x80
+
+#define TF_CREATION 0x01
+#define TF_MODIFY 0x02
+#define TF_ACCESS 0x04
+#define TF_ATTRIBUTES 0x08
+#define TF_BACKUP 0x10
+#define TF_EXPIRATION 0x20
+#define TF_EFFECTIVE 0x40
+#define TF_LONGFORM 0x80
+
+#define NM_CONTINUE 0x80
#define NM_CURRENT 0x100
#define NM_PARENT 0x200
Re: CVS commit: src
Hi, On 2023/04/18 23:00, Nikita Ronja Gillmann wrote: Rin Okuyama transcribed 1.9K bytes: Also, why did you remove copyright notice in luahello.lua? IIUC, this should be agreed by the copyright holder, even if the code in problem seems trivial. Please run a diff on revision 1.2 and 1.3 of that file and tell me what I removed? Because I see nothing which I removed. Oops, new comment directive ``--'' seemed deleted lines for me. I should have double-checked. Sorry for noise!! Thanks, rin
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: christos Date: Tue Apr 18 22:42:52 UTC 2023 Modified Files: src/libexec/ld.elf_so: symbol.c Log Message: Oops wrong mask. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/libexec/ld.elf_so/symbol.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: christos
Date: Tue Apr 18 22:42:52 UTC 2023
Modified Files:
src/libexec/ld.elf_so: symbol.c
Log Message:
Oops wrong mask.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/libexec/ld.elf_so/symbol.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/symbol.c
diff -u src/libexec/ld.elf_so/symbol.c:1.74 src/libexec/ld.elf_so/symbol.c:1.75
--- src/libexec/ld.elf_so/symbol.c:1.74 Tue Apr 18 12:48:45 2023
+++ src/libexec/ld.elf_so/symbol.c Tue Apr 18 18:42:52 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: symbol.c,v 1.74 2023/04/18 16:48:45 christos Exp $ */
+/* $NetBSD: symbol.c,v 1.75 2023/04/18 22:42:52 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: symbol.c,v 1.74 2023/04/18 16:48:45 christos Exp $");
+__RCSID("$NetBSD: symbol.c,v 1.75 2023/04/18 22:42:52 christos Exp $");
#endif /* not lint */
#include
@@ -94,7 +94,7 @@ _rtld_sysv_hash(const char *name)
h = (h << 4) + *p++;
h ^= (h >> 24) & 0xf0;
}
- return (h & 0x);
+ return (h & 0x0fff);
}
/*
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 18 20:11:34 UTC 2023
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch everyone to openssl.old
To generate a diff of this commit:
cvs rdiff -u -r1.1309 -r1.1310 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1309 src/share/mk/bsd.own.mk:1.1310
--- src/share/mk/bsd.own.mk:1.1309 Sun Apr 2 11:06:06 2023
+++ src/share/mk/bsd.own.mk Tue Apr 18 16:11:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1309 2023/04/02 15:06:06 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1310 2023/04/18 20:11:34 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -130,9 +130,9 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
#
HAVE_OPENSSL?= 11
-.if ${HAVE_OPENSSL} == 11
+.if ${HAVE_OPENSSL} == 30
EXTERNAL_OPENSSL_SUBDIR=openssl
-.elif ${HAVE_OPENSSL} == 10
+.elif ${HAVE_OPENSSL} == 11
EXTERNAL_OPENSSL_SUBDIR=openssl.old
.else
EXTERNAL_OPENSSL_SUBDIR=/does/not/exist
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Tue Apr 18 20:11:34 UTC 2023 Modified Files: src/share/mk: bsd.own.mk Log Message: switch everyone to openssl.old To generate a diff of this commit: cvs rdiff -u -r1.1309 -r1.1310 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl.old/dist
Module Name:src Committed By: christos Date: Tue Apr 18 20:11:00 UTC 2023 Removed Files: src/crypto/external/bsd/openssl.old/dist: ACKNOWLEDGMENTS CHANGES.SSLeay GitConfigure GitMake INSTALL.DJGPP INSTALL.MacOS INSTALL.NW INSTALL.OS2 INSTALL.VMS INSTALL.W32 INSTALL.W64 INSTALL.WCE Makefile Makefile.org Makefile.shared PROBLEMS README.ASN1 e_os2.h install.com makevms.com openssl.doxy openssl.spec src/crypto/external/bsd/openssl.old/dist/MacOS: GUSI_Init.cpp OpenSSL.mcp.hqx Randomizer.cpp Randomizer.h TODO _MWERKS_GUSI_prefix.h _MWERKS_prefix.h buildinf.h mklinks.as.hqx opensslconf.h src/crypto/external/bsd/openssl.old/dist/MacOS/GetHTTPS.src: CPStringUtils.cpp CPStringUtils.hpp ErrorHandling.cpp ErrorHandling.hpp GetHTTPS.cpp MacSocket.cpp MacSocket.h src/crypto/external/bsd/openssl.old/dist/Netware: build.bat cpy_tests.bat do_tests.pl globals.txt readme.txt set_env.bat src/crypto/external/bsd/openssl.old/dist/VMS: TODO WISHLIST.TXT install-vms.com mkshared.com multinet_shr.opt openssl_startup.com openssl_undo.com openssl_utils.com socketshr_shr.opt tcpip_shr_decc.opt ucx_shr_decc.opt ucx_shr_decc_log.opt ucx_shr_vaxc.opt src/crypto/external/bsd/openssl.old/dist/apps: CA.com CA.pl CA.sh Makefile dh.c dh512.pem gendh.c install-apps.com makeapps.com oid.cnf progs.h tsget winrand.c src/crypto/external/bsd/openssl.old/dist/apps/demoCA: cacert.pem index.txt serial src/crypto/external/bsd/openssl.old/dist/apps/demoCA/private: cakey.pem src/crypto/external/bsd/openssl.old/dist/apps/set: set-g-ca.pem set-m-ca.pem set_b_ca.pem set_c_ca.pem set_d_ct.pem set_root.pem src/crypto/external/bsd/openssl.old/dist/bugs: MS SSLv3 alpha.c dggccbug.c sgiccbug.c sslref.dif stream.c ultrixcc.c src/crypto/external/bsd/openssl.old/dist/certs: README.RootCerts src/crypto/external/bsd/openssl.old/dist/certs/demo: ca-cert.pem dsa-ca.pem dsa-pca.pem pca-cert.pem src/crypto/external/bsd/openssl.old/dist/certs/expired: ICE.crl src/crypto/external/bsd/openssl.old/dist/crypto: Makefile arm64cpuid.S armv4cpuid.S constant_time_locl.h constant_time_test.c cryptlib.h crypto-lib.com crypto.h ebcdic.h fips_err.h fips_ers.c install-crypto.com md32_common.h o_dir.h o_dir_test.c o_str.h o_time.h opensslconf.h opensslconf.h.in opensslv.h ossl_typ.h s390xcpuid.S symhacks.h src/crypto/external/bsd/openssl.old/dist/crypto/aes: Makefile README aes.h aes_ctr.c aes_locl.h src/crypto/external/bsd/openssl.old/dist/crypto/aes/asm: aes-586.pl aes-x86_64.pl bsaes-x86_64.pl src/crypto/external/bsd/openssl.old/dist/crypto/asn1: Makefile a_bool.c a_bytes.c a_enum.c a_set.c asn1.h asn1_locl.h asn1_mac.h asn1t.h f_enum.c t_crl.c t_req.c t_x509.c t_x509a.c x_attrib.c x_crl.c x_exten.c x_name.c x_nx509.c x_pubkey.c x_req.c x_x509.c x_x509a.c src/crypto/external/bsd/openssl.old/dist/crypto/bf: COPYRIGHT INSTALL Makefile README VERSION bf_cbc.c bf_locl.h bf_opts.c bfs.cpp bfspeed.c bftest.c blowfish.h src/crypto/external/bsd/openssl.old/dist/crypto/bf/asm: bf-686.pl readme src/crypto/external/bsd/openssl.old/dist/crypto/bio: Makefile bio.h bio_lcl.h bss_rtcp.c src/crypto/external/bsd/openssl.old/dist/crypto/bn: Makefile bn.h bn.mul bn_lcl.h bnspeed.c bntest.c divtest.c exp.c expspeed.c exptest.c todo vms-helper.c src/crypto/external/bsd/openssl.old/dist/crypto/bn/asm: README mips3-mont.pl mips3.s pa-risc2.s pa-risc2W.s vms.mar x86.pl src/crypto/external/bsd/openssl.old/dist/crypto/bn/asm/x86: add.pl comba.pl div.pl f mul.pl mul_add.pl sqr.pl sub.pl src/crypto/external/bsd/openssl.old/dist/crypto/buffer: Makefile buf_str.c buffer.h src/crypto/external/bsd/openssl.old/dist/crypto/camellia: Makefile camellia.h cmll_locl.h cmll_utl.c src/crypto/external/bsd/openssl.old/dist/crypto/cast: Makefile cast.h cast_lcl.h cast_spd.c castopts.c casts.cpp casttest.c src/crypto/external/bsd/openssl.old/dist/crypto/cast/asm: readme src/crypto/external/bsd/openssl.old/dist/crypto/cmac: Makefile cmac.h src/crypto/external/bsd/openssl.old/dist/crypto/cms: Makefile cms.h cms_lcl.h src/crypto/external/bsd/openssl.old/dist/crypto/comp: Makefile c_rle.c comp.h src/crypto/external/bsd/openssl.old/dist/crypto/conf: Makefile README cnf_save.c conf.h conf_api.h ssleay.cnf test.c
CVS commit: src/crypto/external/bsd/openssl.old/dist
Module Name:src Committed By: christos Date: Tue Apr 18 20:11:00 UTC 2023 Removed Files: src/crypto/external/bsd/openssl.old/dist: ACKNOWLEDGMENTS CHANGES.SSLeay GitConfigure GitMake INSTALL.DJGPP INSTALL.MacOS INSTALL.NW INSTALL.OS2 INSTALL.VMS INSTALL.W32 INSTALL.W64 INSTALL.WCE Makefile Makefile.org Makefile.shared PROBLEMS README.ASN1 e_os2.h install.com makevms.com openssl.doxy openssl.spec src/crypto/external/bsd/openssl.old/dist/MacOS: GUSI_Init.cpp OpenSSL.mcp.hqx Randomizer.cpp Randomizer.h TODO _MWERKS_GUSI_prefix.h _MWERKS_prefix.h buildinf.h mklinks.as.hqx opensslconf.h src/crypto/external/bsd/openssl.old/dist/MacOS/GetHTTPS.src: CPStringUtils.cpp CPStringUtils.hpp ErrorHandling.cpp ErrorHandling.hpp GetHTTPS.cpp MacSocket.cpp MacSocket.h src/crypto/external/bsd/openssl.old/dist/Netware: build.bat cpy_tests.bat do_tests.pl globals.txt readme.txt set_env.bat src/crypto/external/bsd/openssl.old/dist/VMS: TODO WISHLIST.TXT install-vms.com mkshared.com multinet_shr.opt openssl_startup.com openssl_undo.com openssl_utils.com socketshr_shr.opt tcpip_shr_decc.opt ucx_shr_decc.opt ucx_shr_decc_log.opt ucx_shr_vaxc.opt src/crypto/external/bsd/openssl.old/dist/apps: CA.com CA.pl CA.sh Makefile dh.c dh512.pem gendh.c install-apps.com makeapps.com oid.cnf progs.h tsget winrand.c src/crypto/external/bsd/openssl.old/dist/apps/demoCA: cacert.pem index.txt serial src/crypto/external/bsd/openssl.old/dist/apps/demoCA/private: cakey.pem src/crypto/external/bsd/openssl.old/dist/apps/set: set-g-ca.pem set-m-ca.pem set_b_ca.pem set_c_ca.pem set_d_ct.pem set_root.pem src/crypto/external/bsd/openssl.old/dist/bugs: MS SSLv3 alpha.c dggccbug.c sgiccbug.c sslref.dif stream.c ultrixcc.c src/crypto/external/bsd/openssl.old/dist/certs: README.RootCerts src/crypto/external/bsd/openssl.old/dist/certs/demo: ca-cert.pem dsa-ca.pem dsa-pca.pem pca-cert.pem src/crypto/external/bsd/openssl.old/dist/certs/expired: ICE.crl src/crypto/external/bsd/openssl.old/dist/crypto: Makefile arm64cpuid.S armv4cpuid.S constant_time_locl.h constant_time_test.c cryptlib.h crypto-lib.com crypto.h ebcdic.h fips_err.h fips_ers.c install-crypto.com md32_common.h o_dir.h o_dir_test.c o_str.h o_time.h opensslconf.h opensslconf.h.in opensslv.h ossl_typ.h s390xcpuid.S symhacks.h src/crypto/external/bsd/openssl.old/dist/crypto/aes: Makefile README aes.h aes_ctr.c aes_locl.h src/crypto/external/bsd/openssl.old/dist/crypto/aes/asm: aes-586.pl aes-x86_64.pl bsaes-x86_64.pl src/crypto/external/bsd/openssl.old/dist/crypto/asn1: Makefile a_bool.c a_bytes.c a_enum.c a_set.c asn1.h asn1_locl.h asn1_mac.h asn1t.h f_enum.c t_crl.c t_req.c t_x509.c t_x509a.c x_attrib.c x_crl.c x_exten.c x_name.c x_nx509.c x_pubkey.c x_req.c x_x509.c x_x509a.c src/crypto/external/bsd/openssl.old/dist/crypto/bf: COPYRIGHT INSTALL Makefile README VERSION bf_cbc.c bf_locl.h bf_opts.c bfs.cpp bfspeed.c bftest.c blowfish.h src/crypto/external/bsd/openssl.old/dist/crypto/bf/asm: bf-686.pl readme src/crypto/external/bsd/openssl.old/dist/crypto/bio: Makefile bio.h bio_lcl.h bss_rtcp.c src/crypto/external/bsd/openssl.old/dist/crypto/bn: Makefile bn.h bn.mul bn_lcl.h bnspeed.c bntest.c divtest.c exp.c expspeed.c exptest.c todo vms-helper.c src/crypto/external/bsd/openssl.old/dist/crypto/bn/asm: README mips3-mont.pl mips3.s pa-risc2.s pa-risc2W.s vms.mar x86.pl src/crypto/external/bsd/openssl.old/dist/crypto/bn/asm/x86: add.pl comba.pl div.pl f mul.pl mul_add.pl sqr.pl sub.pl src/crypto/external/bsd/openssl.old/dist/crypto/buffer: Makefile buf_str.c buffer.h src/crypto/external/bsd/openssl.old/dist/crypto/camellia: Makefile camellia.h cmll_locl.h cmll_utl.c src/crypto/external/bsd/openssl.old/dist/crypto/cast: Makefile cast.h cast_lcl.h cast_spd.c castopts.c casts.cpp casttest.c src/crypto/external/bsd/openssl.old/dist/crypto/cast/asm: readme src/crypto/external/bsd/openssl.old/dist/crypto/cmac: Makefile cmac.h src/crypto/external/bsd/openssl.old/dist/crypto/cms: Makefile cms.h cms_lcl.h src/crypto/external/bsd/openssl.old/dist/crypto/comp: Makefile c_rle.c comp.h src/crypto/external/bsd/openssl.old/dist/crypto/conf: Makefile README cnf_save.c conf.h conf_api.h ssleay.cnf test.c
Re: CVS commit: src/sbin/mount_procfs
jk> mount_procfs(8): Document the format of the region descriptor jk> lines contained in the 'map' and 'maps' special files. This is to the best of my understanding, based on reading the code and the UVM usenix paper [1]. Corrections welcome. [1]: https://chuck.cranor.org/p/uvm_usenix.pdf Regards, Joseph Koshy
CVS commit: src/sbin/mount_procfs
Module Name:src Committed By: jkoshy Date: Tue Apr 18 18:42:20 UTC 2023 Modified Files: src/sbin/mount_procfs: mount_procfs.8 Log Message: mount_procfs(8): Document the format of the region descriptor lines contained in the 'map' and 'maps' special files. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sbin/mount_procfs/mount_procfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_procfs/mount_procfs.8 diff -u src/sbin/mount_procfs/mount_procfs.8:1.38 src/sbin/mount_procfs/mount_procfs.8:1.39 --- src/sbin/mount_procfs/mount_procfs.8:1.38 Wed Jan 8 12:04:57 2020 +++ src/sbin/mount_procfs/mount_procfs.8 Tue Apr 18 18:42:20 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_procfs.8,v 1.38 2020/01/08 12:04:57 ad Exp $ +.\" $NetBSD: mount_procfs.8,v 1.39 2023/04/18 18:42:20 jkoshy Exp $ .\" .\" Copyright (c) 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -34,7 +34,7 @@ .\" @(#)mount_procfs.8 8.3 (Berkeley) 6/1/94 .\" .\" -.Dd January 8, 2020 +.Dd April 18, 2023 .Dt MOUNT_PROCFS 8 .Os .Sh NAME @@ -108,9 +108,103 @@ This can be used to gain access to the p or to start another copy of the process. .It Pa map A map of the process' virtual memory. +This file comprises lines describing the memory regions of the process, +where each line contains the following fields: +.Pp +.Bl -tag -compact -width max-protection +.It start-address +The starting address of the region (inclusive). +.It end-address +The ending address of the region (exclusive). +.It protection +The access permissions for the region, represented as +a three-character string using the characters +.Sq r , +.Sq w +and +.Sq x +to denote read, write, and execute permission respectively. +The lack of a permission is represented by a +.Sq - . +.It max-protection +The maximum access permissions for the region represented as +a three character string using the characters +.Sq r , +.Sq w +and +.Sq x +to denote read, write, and execute permission respectively. +The lack of a permission is represented by a +.Sq - . +.It copy-on-write +Whether the region is copy-on-write. +One of: +.Bl -tag -compact -width NCOW +.It COW +A region that is copy-on-write. +.It NCOW +A region that is not copy-on-write. +.El +.It needs-copy +Whether the region needs a copy. +One of: +.Bl -tag -compact -width NNC +.It NC +The region needs a copy. +.It NNC +The region does not need a copy. +.El +.It inheritance +The inheritance code for the region, as set by +.Xr minherit 2 . +.It wired-count +The wired count for the region. +The region can be paged out if its wired count is zero. +.It advice +The advice value set by a prior call to +.Xr madvise 2 +for the region. +.El .It Pa maps A map of the process' virtual memory in a form like the proc filesystem as implemented in Linux. +This file comprises lines describing the memory regions of +the process, where each line contains the following fields: +.Pp +.Bl -tag -compact -width start-address +.It start-address +The starting address of the region (inclusive). +.It end-address +The ending address of the region (exclusive). +.It protection +The access permissions for the region, represented as +a three-character string using the characters +.Sq r , +.Sq w +and +.Sq x +to denote read, write, and execute permission respectively. +The lack of a permission is represented by a +.Sq - . +.It copy-on-write +Whether the region is copy-on-write. +One of: +.Bl -tag -compact -width ".Sq p" +.It Sq p +The region is copy-on-write. +.It Sq s +The region is shared. +.El +.It offset +The offset into the file being mapped by the region. +.It device-id +The major and minor number of the device containing the file +being mapped by the region. +.It fileid +The inode for the file associated with the region. +.It path +The pathname to the file associated with the region. +.El .It Pa mem The complete virtual memory image of the process. Only those addresses which exist in the process can be accessed.
CVS commit: src/sbin/mount_procfs
Module Name:src Committed By: jkoshy Date: Tue Apr 18 18:42:20 UTC 2023 Modified Files: src/sbin/mount_procfs: mount_procfs.8 Log Message: mount_procfs(8): Document the format of the region descriptor lines contained in the 'map' and 'maps' special files. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sbin/mount_procfs/mount_procfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: christos Date: Tue Apr 18 16:48:45 UTC 2023 Modified Files: src/libexec/ld.elf_so: rtld.h symbol.c Log Message: The SysV ABI specifies that the symbol hash function should return only 32 bits of hash. Unfortunately due to an implementation bu and the fact that the return type is unsigned long which is 64 bits in LP64, this can fail in some cases: "\xff\x0f\x0f\x0f\x0f\x0f\x12". See: https://maskray.me/blog/2023-04-12-elf-hash-function >From Ed Maste @ FreeBSD: https://cgit.freebsd.org/src/commit/\ ?id=29e3a06510823edbb91667d21f530d3ec778116d Need to write Unit Tests for this. To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/libexec/ld.elf_so/rtld.h cvs rdiff -u -r1.73 -r1.74 src/libexec/ld.elf_so/symbol.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: christos
Date: Tue Apr 18 16:48:45 UTC 2023
Modified Files:
src/libexec/ld.elf_so: rtld.h symbol.c
Log Message:
The SysV ABI specifies that the symbol hash function should return only 32
bits of hash. Unfortunately due to an implementation bu and the fact that
the return type is unsigned long which is 64 bits in LP64, this can fail
in some cases: "\xff\x0f\x0f\x0f\x0f\x0f\x12". See:
https://maskray.me/blog/2023-04-12-elf-hash-function
>From Ed Maste @ FreeBSD:
https://cgit.freebsd.org/src/commit/\
?id=29e3a06510823edbb91667d21f530d3ec778116d
Need to write Unit Tests for this.
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.73 -r1.74 src/libexec/ld.elf_so/symbol.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.144 src/libexec/ld.elf_so/rtld.h:1.145
--- src/libexec/ld.elf_so/rtld.h:1.144 Tue Jun 21 02:52:17 2022
+++ src/libexec/ld.elf_so/rtld.h Tue Apr 18 12:48:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.144 2022/06/21 06:52:17 skrll Exp $ */
+/* $NetBSD: rtld.h,v 1.145 2023/04/18 16:48:45 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -440,8 +440,8 @@ void _rtld_call_ifunc(Obj_Entry *, sigse
Obj_Entry *_rtld_load_library(const char *, const Obj_Entry *, int);
/* symbol.c */
-unsigned long _rtld_sysv_hash(const char *);
-unsigned long _rtld_gnu_hash(const char *);
+Elf32_Word _rtld_sysv_hash(const char *);
+Elf32_Word _rtld_gnu_hash(const char *);
const Elf_Sym *_rtld_symlook_obj(const char *, Elf_Hash *,
const Obj_Entry *, u_int, const Ver_Entry *);
const Elf_Sym *_rtld_find_symdef(unsigned long, const Obj_Entry *,
Index: src/libexec/ld.elf_so/symbol.c
diff -u src/libexec/ld.elf_so/symbol.c:1.73 src/libexec/ld.elf_so/symbol.c:1.74
--- src/libexec/ld.elf_so/symbol.c:1.73 Sat Feb 29 13:45:20 2020
+++ src/libexec/ld.elf_so/symbol.c Tue Apr 18 12:48:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: symbol.c,v 1.73 2020/02/29 18:45:20 kamil Exp $ */
+/* $NetBSD: symbol.c,v 1.74 2023/04/18 16:48:45 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: symbol.c,v 1.73 2020/02/29 18:45:20 kamil Exp $");
+__RCSID("$NetBSD: symbol.c,v 1.74 2023/04/18 16:48:45 christos Exp $");
#endif /* not lint */
#include
@@ -81,33 +81,27 @@ _rtld_donelist_check(DoneList *dlp, cons
}
/*
- * Hash function for symbol table lookup. Don't even think about changing
- * this. It is specified by the System V ABI.
+ * SysV hash function for symbol table lookup. It is a slightly optimized
+ * version of the hash specified by the System V ABI.
*/
-unsigned long
+Elf32_Word
_rtld_sysv_hash(const char *name)
{
const unsigned char *p = (const unsigned char *) name;
- unsigned long h = 0;
- unsigned long g;
- unsigned long c;
-
- for (; __predict_true((c = *p) != '\0'); p++) {
- h <<= 4;
- h += c;
- if ((g = h & 0xf000) != 0) {
- h ^= g;
- h ^= g >> 24;
- }
+ Elf32_Word h = 0;
+
+ while (__predict_true(*p != '\0')) {
+ h = (h << 4) + *p++;
+ h ^= (h >> 24) & 0xf0;
}
- return (h);
+ return (h & 0x);
}
/*
* Hash function for symbol table lookup. Don't even think about changing
* this. It is specified by the GNU toolchain ABI.
*/
-unsigned long
+Elf32_Word
_rtld_gnu_hash(const char *name)
{
const unsigned char *p = (const unsigned char *) name;
@@ -116,7 +110,7 @@ _rtld_gnu_hash(const char *name)
for (c = *p; c != '\0'; c = *++p)
h = h * 33 + c;
- return (unsigned long)h;
+ return (h & 0x);
}
const Elf_Sym *
CVS commit: src/games/worms
Module Name:src
Committed By: kre
Date: Tue Apr 18 15:02:22 UTC 2023
Modified Files:
src/games/worms: worms.6 worms.c
Log Message:
Correct some unfortunate behaviour in extreme cases pointed out by RVP.
(Very long worms in a smallish window could result in the max number of
worms being 0...)
While here (also suggested by RVP) seed the random number generator,
also add a -S option to set the seed (note: while this is documented
in the updated man page, it does not appear in the usage message in
case of an error ... not likely to be used often enough to include there).
Also some minor improvements suggested by RVP:
delete the prototype for main()
exit curses mode before abort() (which should not happen, but...)
no need to return (->exit) after abort() as modern abort() can
never return.
In addition, check for extraneous (ignored) (non-option) args.
Check for absurdly small or big screens (the worm placement algorithm
doesn't work well for lines of columns < 3, and the abort() mentioned
above actually happens if one of those is == 1).
More flavours of worms added.
Some minor man page wording improvements.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/games/worms/worms.6
cvs rdiff -u -r1.26 -r1.27 src/games/worms/worms.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/worms/worms.6
diff -u src/games/worms/worms.6:1.16 src/games/worms/worms.6:1.17
--- src/games/worms/worms.6:1.16 Wed Oct 14 07:32:53 2020
+++ src/games/worms/worms.6 Tue Apr 18 15:02:22 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: worms.6,v 1.16 2020/10/14 07:32:53 nia Exp $
+.\" $NetBSD: worms.6,v 1.17 2023/04/18 15:02:22 kre Exp $
.\"
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)worms.6 8.1 (Berkeley) 5/31/93
.\"
-.Dd October 14, 2020
+.Dd April 17, 2023
.Dt WORMS 6
.Os
.Sh NAME
@@ -41,6 +41,7 @@
.Op Fl d Ar delay
.Op Fl l Ar length
.Op Fl n Ar number
+.Op Fl S Ar seed
.Sh DESCRIPTION
.Nm
is a
@@ -49,11 +50,11 @@ version of the DEC-2136 program
.Dq worms .
.Pp
The options are as follows:
-.Bl -tag -width XlXlengthXX
+.Bl -tag -width Fl
.It Fl d Ar delay
-Specifies
-.Ar delay
-as a delay, in milliseconds, between each update.
+Specifies a
+.Ar delay ,
+in milliseconds, between each update.
This is useful for fast terminals.
Reasonable values are around 20-200;
the default is 20.
@@ -62,13 +63,31 @@ Makes a
.Dq field
for the worm(s) to eat.
.It Fl l Ar length
-Specifies
+Specifies the
.Ar length
-as a length for each worm; the default is 16.
+of each worm; the default is 16, the minimum is 2.
.It Fl n Ar number
-Specifies
+Specifies the
.Ar number
-as the number of worms; the default is 3.
+of worms; the default is 3.
+There must be at least one.
+.It Fl S Ar seed
+Provide an integer
+.Ar seed
+for the random number generator.
+Specifying zero (0, the default) causes a random seed to be used.
.It Fl t
Makes each worm leave a trail behind it.
.El
+.Pp
+The maximum
+.Ar length ,
+and
+.Ar number ,
+of worms depends upon the screen size, though the
+.Ar length
+can never exceed 1024.
+If the screen is particularly small, even the defaults
+for those may be too large.
+Screens with less than 3 rows or columns cannot be handled,
+nor can ones with insufficient total space.
Index: src/games/worms/worms.c
diff -u src/games/worms/worms.c:1.26 src/games/worms/worms.c:1.27
--- src/games/worms/worms.c:1.26 Sat Apr 15 15:21:56 2023
+++ src/games/worms/worms.c Tue Apr 18 15:02:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: worms.c,v 1.26 2023/04/15 15:21:56 kre Exp $ */
+/* $NetBSD: worms.c,v 1.27 2023/04/18 15:02:22 kre Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)worms.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: worms.c,v 1.26 2023/04/15 15:21:56 kre Exp $");
+__RCSID("$NetBSD: worms.c,v 1.27 2023/04/18 15:02:22 kre Exp $");
#endif
#endif /* not lint */
@@ -67,6 +67,7 @@ __RCSID("$NetBSD: worms.c,v 1.26 2023/04
#include
#include
#include
+#include
#include
#include
#include
@@ -168,7 +169,8 @@ static const struct options {
static const char flavor[] = {
- 'O', '*', '#', '$', '%', '0', '@', '~'
+ 'O', '*', '#', '$', '%', '0', '@', '~',
+ '+', 'w', ':', '^', '_', '&', 'x', 'o'
};
static const short xinc[] = {
1, 1, 1, 0, -1, -1, -1, 0
@@ -182,7 +184,6 @@ static struct worm {
static volatile sig_atomic_t sig_caught = 0;
-int main(int, char **);
static void nomem(void) __dead;
static void onsig(int);
@@ -194,17 +195,20 @@ main(int argc, char *argv[])
const struct options *op;
short *ip;
int CO, LI, last, bottom, ch, length, number, trail;
+ unsigned int seed;
short **ref;
const char *field;
char *ep;
unsigned int delay =
CVS commit: src/games/worms
Module Name:src Committed By: kre Date: Tue Apr 18 15:02:22 UTC 2023 Modified Files: src/games/worms: worms.6 worms.c Log Message: Correct some unfortunate behaviour in extreme cases pointed out by RVP. (Very long worms in a smallish window could result in the max number of worms being 0...) While here (also suggested by RVP) seed the random number generator, also add a -S option to set the seed (note: while this is documented in the updated man page, it does not appear in the usage message in case of an error ... not likely to be used often enough to include there). Also some minor improvements suggested by RVP: delete the prototype for main() exit curses mode before abort() (which should not happen, but...) no need to return (->exit) after abort() as modern abort() can never return. In addition, check for extraneous (ignored) (non-option) args. Check for absurdly small or big screens (the worm placement algorithm doesn't work well for lines of columns < 3, and the abort() mentioned above actually happens if one of those is == 1). More flavours of worms added. Some minor man page wording improvements. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/games/worms/worms.6 cvs rdiff -u -r1.26 -r1.27 src/games/worms/worms.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl.old
Module Name:src
Committed By: christos
Date: Tue Apr 18 14:24:25 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl.old: mkpc
src/crypto/external/bsd/openssl.old/dist/crypto: arm_arch.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl.old/mkpc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl.old/mkpc
diff -u src/crypto/external/bsd/openssl.old/mkpc:1.2 src/crypto/external/bsd/openssl.old/mkpc:1.3
--- src/crypto/external/bsd/openssl.old/mkpc:1.2 Fri Apr 6 11:47:08 2018
+++ src/crypto/external/bsd/openssl.old/mkpc Tue Apr 18 10:24:25 2023
@@ -1,8 +1,8 @@
#!/bin/sh
-# $NetBSD: mkpc,v 1.2 2018/04/06 15:47:08 ryo Exp $
+# $NetBSD: mkpc,v 1.3 2023/04/18 14:24:25 christos Exp $
getversion() {
- (echo '#include "opensslv.h"'; echo OPENSSL_VERSION_TEXT) |
+ (echo '#include "openssl/opensslv.h"'; echo OPENSSL_VERSION_TEXT) |
eval "$CPP $CPPFLAGS" -I$1 | grep OpenSSL | cut -d ' ' -f 2
}
VERSION="$(getversion $1)"
@@ -32,7 +32,7 @@ openssl.pc)
esac
cat << EOF > "$2"
-# \$NetBSD: mkpc,v 1.2 2018/04/06 15:47:08 ryo Exp $
+# \$NetBSD: mkpc,v 1.3 2023/04/18 14:24:25 christos Exp $
prefix=/usr
exec_prefix=/usr
libdir=/usr/lib
Index: src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h
diff -u src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h:1.2 src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h:1.3
--- src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h:1.2 Fri Aug 2 08:07:25 2019
+++ src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h Tue Apr 18 10:24:25 2023
@@ -1,5 +1,14 @@
-#ifndef __ARM_ARCH_H__
-# define __ARM_ARCH_H__
+/*
+ * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License"). You may not use
+ * this file except in compliance with the License. You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OSSL_CRYPTO_ARM_ARCH_H
+# define OSSL_CRYPTO_ARM_ARCH_H
# if !defined(__ARM_ARCH__)
# if defined(__CC_ARM)
@@ -19,7 +28,7 @@
#endif
/*
* Why doesn't gcc define __ARM_ARCH__? Instead it defines
- * bunch of below macros. See all_architectires[] table in
+ * bunch of below macros. See all_architectures[] table in
* gcc/config/arm/arm.c. On a side note it defines
* __ARMEL__/__ARMEB__ for little-/big-endian.
*/
@@ -48,10 +57,6 @@
# endif
# endif
-# ifdef OPENSSL_FIPSCANISTER
-# include
-# endif
-
# if !defined(__ARM_MAX_ARCH__)
# define __ARM_MAX_ARCH__ __ARM_ARCH__
# endif
@@ -64,7 +69,7 @@
# endif
# endif
-# if !__ASSEMBLER__
+# ifndef __ASSEMBLER__
extern unsigned int OPENSSL_armcap_P;
# endif
@@ -74,5 +79,6 @@ extern unsigned int OPENSSL_armcap_P;
# define ARMV8_SHA1 (1<<3)
# define ARMV8_SHA256(1<<4)
# define ARMV8_PMULL (1<<5)
+# define ARMV8_SHA512(1<<6)
#endif
CVS commit: src/crypto/external/bsd/openssl.old
Module Name:src Committed By: christos Date: Tue Apr 18 14:24:25 UTC 2023 Modified Files: src/crypto/external/bsd/openssl.old: mkpc src/crypto/external/bsd/openssl.old/dist/crypto: arm_arch.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl.old/mkpc cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/lua/dist
Module Name:src Committed By: nikita Date: Tue Apr 18 14:07:04 UTC 2023 Modified Files: src/external/mit/lua/dist: README.import Log Message: lua: mention patches with commit IDs in README.import for now. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/lua/dist/README.import Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/lua/dist
Module Name:src Committed By: nikita Date: Tue Apr 18 14:07:04 UTC 2023 Modified Files: src/external/mit/lua/dist: README.import Log Message: lua: mention patches with commit IDs in README.import for now. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/lua/dist/README.import Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/lua/dist/README.import diff -u src/external/mit/lua/dist/README.import:1.3 src/external/mit/lua/dist/README.import:1.4 --- src/external/mit/lua/dist/README.import:1.3 Sun Apr 16 20:46:17 2023 +++ src/external/mit/lua/dist/README.import Tue Apr 18 14:07:03 2023 @@ -18,3 +18,16 @@ Vendor branches are usually named LUA_<< with cvs import, they can be named differently. The last imported vendor branch is called LUA_5_4_4_try2. + +This is Lua version 5.4.4 with these patches applied: +https://github.com/lua/lua/commit/25b143dd34fb587d1e35290c4b25bc08954800e2 +https://github.com/lua/lua/commit/1f3c6f4534c6411313361697d98d1145a1f030fa +https://github.com/lua/lua/commit/c764ca71a639f5585b5f466bea25dc42b855a4b0 +https://github.com/lua/lua/commit/42d40581dd919fb134c07027ca1ce0844c670daf +https://github.com/lua/lua/commit/196bb94d66e727e0aec053a0276c3ad701500762 +https://github.com/lua/lua/commit/997f11f54322883c3181225f29d101a597f31730 +https://github.com/lua/lua/commit/a1f77a234a053da46b06d5d4be00ffb30d3eb45b +https://github.com/lua/lua/commit/a1089b415a3f5c753aa1b40758ffdaf28d5701b0 +https://github.com/lua/lua/commit/1e64c1391f9a14115b5cc82066dbf545ae73ee27 +https://github.com/lua/lua/commit/02bab9fc258fe1cbc6088b1bd61193499d058eff +https://github.com/lua/lua/commit/ab859fe59b464a038a45552921cb2b23892343af
Re: CVS commit: src
Rin Okuyama transcribed 1.9K bytes: Hi, On 2023/04/17 5:46, Nikita wrote: Module Name:src Committed By: nikita Date: Sun Apr 16 20:46:18 UTC 2023 Modified Files: src/distrib/sets/lists/base: ad.aarch64 mi shl.mi src/distrib/sets/lists/debug: shl.mi src/doc: 3RDPARTY CHANGES src/etc/mtree: NetBSD.dist.base NetBSD.dist.compat.in src/external/mit/lua/dist: Makefile README README.import src/external/mit/lua/dist/doc: contents.html lua.1 manual.html readme.html src/external/mit/lua/dist/src: Makefile lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lcode.c lcode.h lcorolib.c lctype.c lctype.h ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h lgc.c lgc.h linit.c liolib.c ljumptab.h llex.c llex.h llimits.h lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c lopcodes.h loslib.c lparser.c lparser.h lprefix.h lstate.c lstate.h lstring.c lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c ltm.h lua.c lua.h luac.c luaconf.h lualib.h lundump.c lundump.h lutf8lib.c lvm.c lvm.h lzio.c lzio.h src/external/mit/lua/lib/liblua: Makefile shlib_version src/share/mk: bsd.lua.mk src/sys/modules/examples/luahello: luahello.lua src/sys/modules/lua: Makefile Removed Files: src/external/mit/lua/dist/src: lbitlib.c Log Message: Resolve conflicts for lua 5.4.4 import. Adjust various files for lua 5.4.4. ... diffs are larger than 1MB and have been omitted Thank you very much for working on this field! Please consider to split this kind of commits into two parts: (1) merge for "extern/.../dist", and (2) glue parts outside "dist". Diffs larger than 1MB are omitted for source-changes-full@, and it makes us difficult to understand why and how ad.aarch64 was modified, for example. Also, why did you remove copyright notice in luahello.lua? IIUC, this should be agreed by the copyright holder, even if the code in problem seems trivial. Please run a diff on revision 1.2 and 1.3 of that file and tell me what I removed? Because I see nothing which I removed. Thanks, rin
Re: CVS commit: src
Rin Okuyama transcribed 1.9K bytes: Hi, On 2023/04/17 5:46, Nikita wrote: Module Name:src Committed By: nikita Date: Sun Apr 16 20:46:18 UTC 2023 Modified Files: src/distrib/sets/lists/base: ad.aarch64 mi shl.mi src/distrib/sets/lists/debug: shl.mi src/doc: 3RDPARTY CHANGES src/etc/mtree: NetBSD.dist.base NetBSD.dist.compat.in src/external/mit/lua/dist: Makefile README README.import src/external/mit/lua/dist/doc: contents.html lua.1 manual.html readme.html src/external/mit/lua/dist/src: Makefile lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lcode.c lcode.h lcorolib.c lctype.c lctype.h ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h lgc.c lgc.h linit.c liolib.c ljumptab.h llex.c llex.h llimits.h lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c lopcodes.h loslib.c lparser.c lparser.h lprefix.h lstate.c lstate.h lstring.c lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c ltm.h lua.c lua.h luac.c luaconf.h lualib.h lundump.c lundump.h lutf8lib.c lvm.c lvm.h lzio.c lzio.h src/external/mit/lua/lib/liblua: Makefile shlib_version src/share/mk: bsd.lua.mk src/sys/modules/examples/luahello: luahello.lua src/sys/modules/lua: Makefile Removed Files: src/external/mit/lua/dist/src: lbitlib.c Log Message: Resolve conflicts for lua 5.4.4 import. Adjust various files for lua 5.4.4. ... diffs are larger than 1MB and have been omitted Thank you very much for working on this field! Please consider to split this kind of commits into two parts: (1) merge for "extern/.../dist", and (2) glue parts outside "dist". Diffs larger than 1MB are omitted for source-changes-full@, and it makes us difficult to understand why and how ad.aarch64 was modified, for example. Okay, noted for next time. Also, why did you remove copyright notice in luahello.lua? IIUC, this should be agreed by the copyright holder, even if the code in problem seems trivial. I'll check, but all I did some months back from what I remember is change the form of comment style (to the one lua reads as code comments) Thanks, rin
Re: CVS commit: src/external/mit/lua/dist/src
Hi, okay. I'll add them for now as notes in one of the README files in the lua directory. Rin Okuyama transcribed 0.4K bytes: Hello again, On 2023/04/18 4:16, Nikita wrote: Module Name:src Committed By: nikita Date: Mon Apr 17 19:16:38 UTC 2023 Modified Files: src/external/mit/lua/dist/src: lua.c Log Message: lua: Apply upstream bugfix for "lua.c assumes that argv has at least one element." Upstream commit number, and URL for the commit on web interface of VCS must be very helpful for us. Thanks, rin
Re: CVS commit: src/external/mit/lua/dist/src
Hello again, On 2023/04/18 4:16, Nikita wrote: Module Name:src Committed By: nikita Date: Mon Apr 17 19:16:38 UTC 2023 Modified Files: src/external/mit/lua/dist/src: lua.c Log Message: lua: Apply upstream bugfix for "lua.c assumes that argv has at least one element." Upstream commit number, and URL for the commit on web interface of VCS must be very helpful for us. Thanks, rin
Re: CVS commit: src
Hi, On 2023/04/17 5:46, Nikita wrote: Module Name:src Committed By: nikita Date: Sun Apr 16 20:46:18 UTC 2023 Modified Files: src/distrib/sets/lists/base: ad.aarch64 mi shl.mi src/distrib/sets/lists/debug: shl.mi src/doc: 3RDPARTY CHANGES src/etc/mtree: NetBSD.dist.base NetBSD.dist.compat.in src/external/mit/lua/dist: Makefile README README.import src/external/mit/lua/dist/doc: contents.html lua.1 manual.html readme.html src/external/mit/lua/dist/src: Makefile lapi.c lapi.h lauxlib.c lauxlib.h lbaselib.c lcode.c lcode.h lcorolib.c lctype.c lctype.h ldblib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h lgc.c lgc.h linit.c liolib.c ljumptab.h llex.c llex.h llimits.h lmathlib.c lmem.c lmem.h loadlib.c lobject.c lobject.h lopcodes.c lopcodes.h loslib.c lparser.c lparser.h lprefix.h lstate.c lstate.h lstring.c lstring.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c ltm.h lua.c lua.h luac.c luaconf.h lualib.h lundump.c lundump.h lutf8lib.c lvm.c lvm.h lzio.c lzio.h src/external/mit/lua/lib/liblua: Makefile shlib_version src/share/mk: bsd.lua.mk src/sys/modules/examples/luahello: luahello.lua src/sys/modules/lua: Makefile Removed Files: src/external/mit/lua/dist/src: lbitlib.c Log Message: Resolve conflicts for lua 5.4.4 import. Adjust various files for lua 5.4.4. ... diffs are larger than 1MB and have been omitted Thank you very much for working on this field! Please consider to split this kind of commits into two parts: (1) merge for "extern/.../dist", and (2) glue parts outside "dist". Diffs larger than 1MB are omitted for source-changes-full@, and it makes us difficult to understand why and how ad.aarch64 was modified, for example. Also, why did you remove copyright notice in luahello.lua? IIUC, this should be agreed by the copyright holder, even if the code in problem seems trivial. Thanks, rin
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: skrll Date: Tue Apr 18 11:06:57 UTC 2023 Modified Files: src/sys/arch/arm/include: bus_funcs.h Log Message: G/C unnecessary extern paddr_t physical_start, physical_end; To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/include/bus_funcs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/bus_funcs.h diff -u src/sys/arch/arm/include/bus_funcs.h:1.12 src/sys/arch/arm/include/bus_funcs.h:1.13 --- src/sys/arch/arm/include/bus_funcs.h:1.12 Sat Nov 19 12:15:22 2022 +++ src/sys/arch/arm/include/bus_funcs.h Tue Apr 18 11:06:57 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_funcs.h,v 1.12 2022/11/19 12:15:22 skrll Exp $ */ +/* $NetBSD: bus_funcs.h,v 1.13 2023/04/18 11:06:57 skrll Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -708,8 +708,6 @@ void bus_dmamap_sync(bus_dma_tag_t, bus_ #ifdef _ARM32_BUS_DMA_PRIVATE -extern paddr_t physical_start, physical_end; - int arm32_dma_range_intersect(struct arm32_dma_range *, int, paddr_t pa, psize_t size, paddr_t *pap, psize_t *sizep);
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: skrll Date: Tue Apr 18 11:06:57 UTC 2023 Modified Files: src/sys/arch/arm/include: bus_funcs.h Log Message: G/C unnecessary extern paddr_t physical_start, physical_end; To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/include/bus_funcs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nikita Date: Tue Apr 18 09:56:57 UTC 2023 Modified Files: src/doc: 3RDPARTY Log Message: Mention applied bugfixes for Lua. To generate a diff of this commit: cvs rdiff -u -r1.1920 -r1.1921 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1920 src/doc/3RDPARTY:1.1921 --- src/doc/3RDPARTY:1.1920 Sun Apr 16 20:46:16 2023 +++ src/doc/3RDPARTY Tue Apr 18 09:56:57 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1920 2023/04/16 20:46:16 nikita Exp $ +# $NetBSD: 3RDPARTY,v 1.1921 2023/04/18 09:56:57 nikita Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -843,6 +843,8 @@ Location: external/mit/lua/dist Notes: The default module paths have been changed to not include the current working directory '.' to avoid potential security problems. +All 11 bugfixes listed on http://www.lua.org/bugs.html#5.4.4 as of 2023-04-18 +have been applied. Package: Lutok Version: 0.3
CVS commit: src/doc
Module Name:src Committed By: nikita Date: Tue Apr 18 09:56:57 UTC 2023 Modified Files: src/doc: 3RDPARTY Log Message: Mention applied bugfixes for Lua. To generate a diff of this commit: cvs rdiff -u -r1.1920 -r1.1921 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Tue Apr 18 07:53:31 UTC 2023
Modified Files:
src/sys/arch/aarch64/aarch64: aarch64_machdep.c
Log Message:
G/C an outdated comment.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/aarch64/aarch64/aarch64_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/aarch64_machdep.c
diff -u src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.68 src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.69
--- src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.68 Sun Apr 16 14:01:51 2023
+++ src/sys/arch/aarch64/aarch64/aarch64_machdep.c Tue Apr 18 07:53:31 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.68 2023/04/16 14:01:51 skrll Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.69 2023/04/18 07:53:31 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.68 2023/04/16 14:01:51 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.69 2023/04/18 07:53:31 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_cpuoptions.h"
@@ -289,7 +289,6 @@ initarm_common(vaddr_t kvm_base, vsize_t
paddr_t kernstart_phys __unused = KERN_VTOPHYS(kernstart);
paddr_t kernend_phys __unused = KERN_VTOPHYS(kernend);
- /* XXX: arm/arm32/bus_dma.c refers physical_{start,end} */
physical_start = bootconfig.dram[0].address;
physical_end = bootconfig.dram[bootconfig.dramblocks - 1].address +
ptoa(bootconfig.dram[bootconfig.dramblocks - 1].pages);
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: skrll Date: Tue Apr 18 07:53:31 UTC 2023 Modified Files: src/sys/arch/aarch64/aarch64: aarch64_machdep.c Log Message: G/C an outdated comment. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/aarch64/aarch64/aarch64_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: riastradh Date: Tue Apr 18 06:37:25 UTC 2023 Modified Files: src/sys/dev/isapnp: sb_isapnp.c src/sys/dev/ofisa: sb_ofisa.c Log Message: sb(4): Fix missing mutex initialization at isapnp and ofisa. PR kern/57363 XXX pullup-8 XXX pullup-9 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/dev/isapnp/sb_isapnp.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ofisa/sb_ofisa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/isapnp/sb_isapnp.c diff -u src/sys/dev/isapnp/sb_isapnp.c:1.53 src/sys/dev/isapnp/sb_isapnp.c:1.54 --- src/sys/dev/isapnp/sb_isapnp.c:1.53 Wed May 8 13:40:18 2019 +++ src/sys/dev/isapnp/sb_isapnp.c Tue Apr 18 06:37:25 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: sb_isapnp.c,v 1.53 2019/05/08 13:40:18 isaki Exp $ */ +/* $NetBSD: sb_isapnp.c,v 1.54 2023/04/18 06:37:25 riastradh Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.53 2019/05/08 13:40:18 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.54 2023/04/18 06:37:25 riastradh Exp $"); #include #include @@ -158,6 +158,9 @@ sb_isapnp_attach(device_t parent, device return; } + mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_NONE); + mutex_init(>sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO); + sc->sc_ih = isa_intr_establish(ipa->ipa_ic, ipa->ipa_irq[0].num, ipa->ipa_irq[0].type, IPL_AUDIO, sbdsp_intr, sc); Index: src/sys/dev/ofisa/sb_ofisa.c diff -u src/sys/dev/ofisa/sb_ofisa.c:1.23 src/sys/dev/ofisa/sb_ofisa.c:1.24 --- src/sys/dev/ofisa/sb_ofisa.c:1.23 Wed Jan 27 03:10:21 2021 +++ src/sys/dev/ofisa/sb_ofisa.c Tue Apr 18 06:37:25 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: sb_ofisa.c,v 1.23 2021/01/27 03:10:21 thorpej Exp $ */ +/* $NetBSD: sb_ofisa.c,v 1.24 2023/04/18 06:37:25 riastradh Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.23 2021/01/27 03:10:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.24 2023/04/18 06:37:25 riastradh Exp $"); #include #include @@ -170,6 +170,9 @@ sb_ofisa_attach(device_t parent, device_ return; } + mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_NONE); + mutex_init(>sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO); + sc->sc_ih = isa_intr_establish(aa->ic, intr.irq, IST_EDGE, IPL_AUDIO, sbdsp_intr, sc);
CVS commit: src/sys/dev
Module Name:src Committed By: riastradh Date: Tue Apr 18 06:37:25 UTC 2023 Modified Files: src/sys/dev/isapnp: sb_isapnp.c src/sys/dev/ofisa: sb_ofisa.c Log Message: sb(4): Fix missing mutex initialization at isapnp and ofisa. PR kern/57363 XXX pullup-8 XXX pullup-9 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/dev/isapnp/sb_isapnp.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ofisa/sb_ofisa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
