CVS commit: src/share/locale/ctype
Module Name:src Committed By: wiz Date: Wed Dec 21 06:25:35 UTC 2022 Modified Files: src/share/locale/ctype: en_US.UTF-8.src Log Message: Update Unicode tables to 15.0.0. This is based on the tables provided by perl 5.37.7. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/locale/ctype/en_US.UTF-8.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/locale/ctype/en_US.UTF-8.src diff -u src/share/locale/ctype/en_US.UTF-8.src:1.9 src/share/locale/ctype/en_US.UTF-8.src:1.10 --- src/share/locale/ctype/en_US.UTF-8.src:1.9 Tue Dec 20 23:08:51 2022 +++ src/share/locale/ctype/en_US.UTF-8.src Wed Dec 21 06:25:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: en_US.UTF-8.src,v 1.9 2022/12/20 23:08:51 wiz Exp $ */ +/* $NetBSD: en_US.UTF-8.src,v 1.10 2022/12/21 06:25:35 wiz Exp $ */ /* * COPYRIGHT AND PERMISSION NOTICE @@ -40,7 +40,7 @@ ENCODING"UTF8" VARIABLECODESET=UTF-8 -/* Unicode Version 14.0.0 */ +/* Unicode Version 15.0.0 */ /* * U+ - U+007F : Basic Latin @@ -1192,9 +1192,9 @@ TODIGIT < 0x0bf2 1000 > * U+0C00 - U+0C7F : Telugu */ -ALPHA 0x0c00 - 0x0c03 0x0c05 - 0x0c0c 0x0c0e - 0x0c10 0x0c12 - 0x0c28 -ALPHA 0x0c2a - 0x0c39 0x0c3d - 0x0c44 0x0c46 - 0x0c48 0x0c4a - 0x0c4c -ALPHA 0x0c55 - 0x0c56 0x0c58 - 0x0c5a 0x0c5d 0x0c60 - 0x0c63 +ALPHA 0x0c00 - 0x0c0c 0x0c0e - 0x0c10 0x0c12 - 0x0c28 0x0c2a - 0x0c39 +ALPHA 0x0c3d - 0x0c44 0x0c46 - 0x0c48 0x0c4a - 0x0c4c 0x0c55 - 0x0c56 +ALPHA 0x0c58 - 0x0c5a 0x0c5d 0x0c60 - 0x0c63 DIGIT 0x0c66 - 0x0c6f GRAPH 0x0c00 - 0x0c0c 0x0c0e - 0x0c10 0x0c12 - 0x0c28 0x0c2a - 0x0c39 GRAPH 0x0c3c - 0x0c44 0x0c46 - 0x0c48 0x0c4a - 0x0c4d 0x0c55 - 0x0c56 @@ -1205,7 +1205,7 @@ PRINT 0x0c00 - 0x0c0c 0x0c0e - 0x0c PRINT 0x0c3c - 0x0c44 0x0c46 - 0x0c48 0x0c4a - 0x0c4d 0x0c55 - 0x0c56 PRINT 0x0c58 - 0x0c5a 0x0c5d 0x0c60 - 0x0c63 0x0c66 - 0x0c6f PRINT 0x0c77 - 0x0c7f -SPECIAL 0x0c04 0x0c3c 0x0c4d 0x0c78 - 0x0c7e +SPECIAL 0x0c3c 0x0c4d 0x0c78 - 0x0c7e SWIDTH0 0x0c00 0x0c04 0x0c3c 0x0c3e - 0x0c40 0x0c46 - 0x0c48 SWIDTH0 0x0c4a - 0x0c4d 0x0c55 - 0x0c56 0x0c62 - 0x0c63 SWIDTH1 0x0c01 - 0x0c03 0x0c05 - 0x0c0c 0x0c0e - 0x0c10 0x0c12 - 0x0c28 @@ -1223,23 +1223,23 @@ TODIGIT < 0x0c7c - 0x0c7e : 1 > ALPHA 0x0c80 - 0x0c83 0x0c85 - 0x0c8c 0x0c8e - 0x0c90 0x0c92 - 0x0ca8 ALPHA 0x0caa - 0x0cb3 0x0cb5 - 0x0cb9 0x0cbd - 0x0cc4 0x0cc6 - 0x0cc8 ALPHA 0x0cca - 0x0ccc 0x0cd5 - 0x0cd6 0x0cdd - 0x0cde 0x0ce0 - 0x0ce3 -ALPHA 0x0cf1 - 0x0cf2 +ALPHA 0x0cf1 - 0x0cf3 DIGIT 0x0ce6 - 0x0cef GRAPH 0x0c80 - 0x0c8c 0x0c8e - 0x0c90 0x0c92 - 0x0ca8 0x0caa - 0x0cb3 GRAPH 0x0cb5 - 0x0cb9 0x0cbc - 0x0cc4 0x0cc6 - 0x0cc8 0x0cca - 0x0ccd GRAPH 0x0cd5 - 0x0cd6 0x0cdd - 0x0cde 0x0ce0 - 0x0ce3 0x0ce6 - 0x0cef -GRAPH 0x0cf1 - 0x0cf2 +GRAPH 0x0cf1 - 0x0cf3 PUNCT 0x0c84 PRINT 0x0c80 - 0x0c8c 0x0c8e - 0x0c90 0x0c92 - 0x0ca8 0x0caa - 0x0cb3 PRINT 0x0cb5 - 0x0cb9 0x0cbc - 0x0cc4 0x0cc6 - 0x0cc8 0x0cca - 0x0ccd PRINT 0x0cd5 - 0x0cd6 0x0cdd - 0x0cde 0x0ce0 - 0x0ce3 0x0ce6 - 0x0cef -PRINT 0x0cf1 - 0x0cf2 +PRINT 0x0cf1 - 0x0cf3 SPECIAL 0x0cbc 0x0ccd SWIDTH0 0x0c81 0x0cbc 0x0cbf 0x0cc6 0x0ccc - 0x0ccd 0x0ce2 - 0x0ce3 SWIDTH1 0x0c80 0x0c82 - 0x0c8c 0x0c8e - 0x0c90 0x0c92 - 0x0ca8 SWIDTH1 0x0caa - 0x0cb3 0x0cb5 - 0x0cb9 0x0cbd - 0x0cbe 0x0cc0 - 0x0cc4 SWIDTH1 0x0cc7 - 0x0cc8 0x0cca - 0x0ccb 0x0cd5 - 0x0cd6 0x0cdd - 0x0cde -SWIDTH1 0x0ce0 - 0x0ce1 0x0ce6 - 0x0cef 0x0cf1 - 0x0cf2 +SWIDTH1 0x0ce0 - 0x0ce1 0x0ce6 - 0x0cef 0x0cf1 - 0x0cf3 TODIGIT < 0x0ce6 - 0x0cef : 0x > @@ -1314,13 +1314,13 @@ ALPHA 0x0ea7 - 0x0eb9 0x0ebb - 0x0e ALPHA 0x0edc - 0x0edf DIGIT 0x0ed0 - 0x0ed9 GRAPH 0x0e81 - 0x0e82 0x0e84 0x0e86 - 0x0e8a 0x0e8c - 0x0ea3 0x0ea5 -GRAPH 0x0ea7 - 0x0ebd 0x0ec0 - 0x0ec4 0x0ec6 0x0ec8 - 0x0ecd +GRAPH 0x0ea7 - 0x0ebd 0x0ec0 - 0x0ec4 0x0ec6 0x0ec8 - 0x0ece GRAPH 0x0ed0 - 0x0ed9 0x0edc - 0x0edf PRINT 0x0e81 - 0x0e82 0x0e84 0x0e86 - 0x0e8a 0x0e8c - 0x0ea3 0x0ea5 -PRINT 0x0ea7 - 0x0ebd 0x0ec0 - 0x0ec4 0x0ec6 0x0ec8 - 0x0ecd +PRINT 0x0ea7 - 0x0ebd 0x0ec0 - 0x0ec4 0x0ec6 0x0ec8 - 0x0ece PRINT 0x0ed0 - 0x0ed9 0x0edc - 0x0edf -SPECIAL 0x0eba 0x0ec8 - 0x0ecc -SWIDTH0 0x0eb1 0x0eb4 - 0x0ebc 0x0ec8 - 0x0ecd +SPECIAL 0x0eba 0x0ec8 - 0x0ecc 0x0ece +SWIDTH0 0x0eb1 0x0eb4 - 0x0ebc 0x0ec8 - 0x0ece SWIDTH1 0x0e81 - 0x0e82 0x0e84 0x0e86 - 0x0e8a 0x0e8c - 0x0ea3 0x0ea5 SWIDTH1 0x0ea7 - 0x0eb0 0x0eb2 - 0x0eb3 0x0ebd 0x0ec0 - 0x0ec4 0x0ec6 SWIDTH1 0x0ed0 - 0x0ed9 0x0edc - 0x0edf @@ -1331,7 +1331,7 @@ TODIGIT < 0x0ed0 - 0x0ed9 : 0x > * U+0F00 - U+0FFF : Tibetan */ -ALPHA 0x0f00 0x0f40 - 0x0f47 0x0f49 - 0x0f6c
CVS commit: src/share/locale/ctype
Module Name:src Committed By: wiz Date: Wed Dec 21 06:25:35 UTC 2022 Modified Files: src/share/locale/ctype: en_US.UTF-8.src Log Message: Update Unicode tables to 15.0.0. This is based on the tables provided by perl 5.37.7. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/locale/ctype/en_US.UTF-8.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libcurses
Module Name:src
Committed By: blymn
Date: Wed Dec 21 06:18:01 UTC 2022
Modified Files:
src/lib/libcurses: addnstr.c printw.c
Log Message:
Add more debug so a call to waddbytes can be traced to the caller.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libcurses/addnstr.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libcurses/printw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/addnstr.c
diff -u src/lib/libcurses/addnstr.c:1.20 src/lib/libcurses/addnstr.c:1.21
--- src/lib/libcurses/addnstr.c:1.20 Tue Oct 19 06:41:03 2021
+++ src/lib/libcurses/addnstr.c Wed Dec 21 06:18:01 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: addnstr.c,v 1.20 2021/10/19 06:41:03 blymn Exp $ */
+/* $NetBSD: addnstr.c,v 1.21 2022/12/21 06:18:01 blymn Exp $ */
/*
* Copyright (c) 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)addnstr.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: addnstr.c,v 1.20 2021/10/19 06:41:03 blymn Exp $");
+__RCSID("$NetBSD: addnstr.c,v 1.21 2022/12/21 06:18:01 blymn Exp $");
#endif
#endif/* not lint */
@@ -52,6 +52,8 @@ __RCSID("$NetBSD: addnstr.c,v 1.20 2021/
int
addstr(const char *s)
{
+ __CTRACE(__CTRACE_INPUT, "addstr: %s\n", s);
+
return waddnstr(stdscr, s, -1);
}
@@ -62,6 +64,8 @@ addstr(const char *s)
int
waddstr(WINDOW *win, const char *s)
{
+ __CTRACE(__CTRACE_INPUT, "addstr: win %p, sttring: %s\n", win, s);
+
return waddnstr(win, s, -1);
}
@@ -73,6 +77,8 @@ waddstr(WINDOW *win, const char *s)
int
addnstr(const char *str, int n)
{
+ __CTRACE(__CTRACE_INPUT, "addnstr: n: %d, string: %s\n", n, str);
+
return waddnstr(stdscr, str, n);
}
@@ -83,6 +89,9 @@ addnstr(const char *str, int n)
int
mvaddstr(int y, int x, const char *str)
{
+ __CTRACE(__CTRACE_INPUT, "mvaddnstr: y: %d, x: %d, string: %s\n", y,
+ x, str);
+
return mvwaddnstr(stdscr, y, x, str, -1);
}
@@ -93,6 +102,9 @@ mvaddstr(int y, int x, const char *str)
int
mvwaddstr(WINDOW *win, int y, int x, const char *str)
{
+ __CTRACE(__CTRACE_INPUT, "mvwaddnstr: win: %p, y: %d, x: %d, string: %s\n",
+ win, y, x, str);
+
return mvwaddnstr(win, y, x, str, -1);
}
@@ -104,6 +116,9 @@ mvwaddstr(WINDOW *win, int y, int x, con
int
mvaddnstr(int y, int x, const char *str, int count)
{
+ __CTRACE(__CTRACE_INPUT, "mvaddnstr: n: %d, y: %d, x: %d, string: %s\n",
+ count, y, x, str);
+
return mvwaddnstr(stdscr, y, x, str, count);
}
@@ -115,6 +130,9 @@ mvaddnstr(int y, int x, const char *str,
int
mvwaddnstr(WINDOW *win, int y, int x, const char *str, int count)
{
+ __CTRACE(__CTRACE_INPUT, "mvwaddnstr: win: %p, n: %d, y: %d, x: %d, string: %s\n",
+ win, count, y, x, str);
+
if (wmove(win, y, x) == ERR)
return ERR;
Index: src/lib/libcurses/printw.c
diff -u src/lib/libcurses/printw.c:1.29 src/lib/libcurses/printw.c:1.30
--- src/lib/libcurses/printw.c:1.29 Sun Jun 9 07:40:14 2019
+++ src/lib/libcurses/printw.c Wed Dec 21 06:18:01 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: printw.c,v 1.29 2019/06/09 07:40:14 blymn Exp $ */
+/* $NetBSD: printw.c,v 1.30 2022/12/21 06:18:01 blymn Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)printw.c 8.3 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: printw.c,v 1.29 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: printw.c,v 1.30 2022/12/21 06:18:01 blymn Exp $");
#endif
#endif/* not lint */
@@ -120,6 +120,8 @@ vw_printw(WINDOW *win, const char *fmt,
{
int n;
+ __CTRACE(__CTRACE_INPUT, "vw_printw: win %p\n", win);
+
if (win->fp == NULL) {
win->fp = open_memstream(>buf, >buflen);
if (__predict_false(win->fp == NULL))
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Wed Dec 21 06:18:01 UTC 2022 Modified Files: src/lib/libcurses: addnstr.c printw.c Log Message: Add more debug so a call to waddbytes can be traced to the caller. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libcurses/addnstr.c cvs rdiff -u -r1.29 -r1.30 src/lib/libcurses/printw.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: nonaka
Date: Wed Dec 21 05:19:15 UTC 2022
Modified Files:
src/sys/dev/pci: if_rge.c if_rgereg.h
Log Message:
Update the Rx descriptor based on the vendor driver for Linux.
This fixes a panic on RTL8125.
Patch from OpenBSD if_rge.c r1.20, if_rgereg.h r1.8.
Tested by msaitoh@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_rge.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/if_rgereg.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/dev/pci/if_rge.c
diff -u src/sys/dev/pci/if_rge.c:1.24 src/sys/dev/pci/if_rge.c:1.25
--- src/sys/dev/pci/if_rge.c:1.24 Sat Sep 24 18:12:42 2022
+++ src/sys/dev/pci/if_rge.c Wed Dec 21 05:19:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rge.c,v 1.24 2022/09/24 18:12:42 thorpej Exp $ */
+/* $NetBSD: if_rge.c,v 1.25 2022/12/21 05:19:15 nonaka Exp $ */
/* $OpenBSD: if_rge.c,v 1.9 2020/12/12 11:48:53 jan Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.24 2022/09/24 18:12:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.25 2022/12/21 05:19:15 nonaka Exp $");
#include
@@ -1132,22 +1132,16 @@ rge_newbuf(struct rge_softc *sc, int idx
/* Map the segments into RX descriptors. */
r = >rge_ldata.rge_rx_list[idx];
- if (RGE_OWN(r)) {
- device_printf(sc->sc_dev, "tried to map busy RX descriptor\n");
- goto out;
- }
-
rxq->rxq_mbuf = m;
- r->rge_extsts = 0;
- r->rge_addrlo = htole32(RGE_ADDR_LO(rxmap->dm_segs[0].ds_addr));
- r->rge_addrhi = htole32(RGE_ADDR_HI(rxmap->dm_segs[0].ds_addr));
+ r->hi_qword1.rx_qword4.rge_extsts = 0;
+ r->hi_qword0.rge_addr = htole64(rxmap->dm_segs[0].ds_addr);
- r->rge_cmdsts = htole32(rxmap->dm_segs[0].ds_len);
+ r->hi_qword1.rx_qword4.rge_cmdsts = htole32(rxmap->dm_segs[0].ds_len);
if (idx == RGE_RX_LIST_CNT - 1)
- r->rge_cmdsts |= htole32(RGE_RDCMDSTS_EOR);
+ r->hi_qword1.rx_qword4.rge_cmdsts |= htole32(RGE_RDCMDSTS_EOR);
- r->rge_cmdsts |= htole32(RGE_RDCMDSTS_OWN);
+ r->hi_qword1.rx_qword4.rge_cmdsts |= htole32(RGE_RDCMDSTS_OWN);
bus_dmamap_sync(sc->sc_dmat, sc->rge_ldata.rge_rx_list_map,
idx * sizeof(struct rge_rx_desc), sizeof(struct rge_rx_desc),
@@ -1167,11 +1161,11 @@ rge_discard_rxbuf(struct rge_softc *sc,
r = >rge_ldata.rge_rx_list[idx];
- r->rge_cmdsts = htole32(RGE_JUMBO_FRAMELEN);
- r->rge_extsts = 0;
+ r->hi_qword1.rx_qword4.rge_cmdsts = htole32(RGE_JUMBO_FRAMELEN);
+ r->hi_qword1.rx_qword4.rge_extsts = 0;
if (idx == RGE_RX_LIST_CNT - 1)
- r->rge_cmdsts |= htole32(RGE_RDCMDSTS_EOR);
- r->rge_cmdsts |= htole32(RGE_RDCMDSTS_OWN);
+ r->hi_qword1.rx_qword4.rge_cmdsts |= htole32(RGE_RDCMDSTS_EOR);
+ r->hi_qword1.rx_qword4.rge_cmdsts |= htole32(RGE_RDCMDSTS_OWN);
bus_dmamap_sync(sc->sc_dmat, sc->rge_ldata.rge_rx_list_map,
idx * sizeof(struct rge_rx_desc), sizeof(struct rge_rx_desc),
@@ -1235,8 +1229,8 @@ rge_rxeof(struct rge_softc *sc)
if (RGE_OWN(cur_rx))
break;
- rxstat = letoh32(cur_rx->rge_cmdsts);
- extsts = letoh32(cur_rx->rge_extsts);
+ rxstat = letoh32(cur_rx->hi_qword1.rx_qword4.rge_cmdsts);
+ extsts = letoh32(cur_rx->hi_qword1.rx_qword4.rge_extsts);
total_len = RGE_RXBYTES(cur_rx);
rxq = >rge_ldata.rge_rxq[i];
@@ -1317,16 +1311,16 @@ rge_rxeof(struct rge_softc *sc)
#if notyet
/* Check IP header checksum. */
- if (!(rxstat & RGE_RDCMDSTS_IPCSUMERR) &&
+ if (!(extsts & RGE_RDEXTSTS_IPCSUMERR) &&
(extsts & RGE_RDEXTSTS_IPV4))
m->m_pkthdr.csum_flags |= M_IPV4_CSUM_IN_OK;
/* Check TCP/UDP checksum. */
if ((extsts & (RGE_RDEXTSTS_IPV4 | RGE_RDEXTSTS_IPV6)) &&
- (((rxstat & RGE_RDCMDSTS_TCPPKT) &&
- !(rxstat & RGE_RDCMDSTS_TCPCSUMERR)) ||
- ((rxstat & RGE_RDCMDSTS_UDPPKT) &&
- !(rxstat & RGE_RDCMDSTS_UDPCSUMERR
+ (((extsts & RGE_RDEXTSTS_TCPPKT) &&
+ !(extsts & RGE_RDEXTSTS_TCPCSUMERR)) ||
+ ((extsts & RGE_RDEXTSTS_UDPPKT) &&
+ !(extsts & RGE_RDEXTSTS_UDPCSUMERR
m->m_pkthdr.csum_flags |= M_TCP_CSUM_IN_OK |
M_UDP_CSUM_IN_OK;
#endif
Index: src/sys/dev/pci/if_rgereg.h
diff -u src/sys/dev/pci/if_rgereg.h:1.6 src/sys/dev/pci/if_rgereg.h:1.7
--- src/sys/dev/pci/if_rgereg.h:1.6 Sun Aug 28 07:44:23 2022
+++ src/sys/dev/pci/if_rgereg.h Wed Dec 21 05:19:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rgereg.h,v 1.6 2022/08/28 07:44:23 skrll Exp $ */
+/* $NetBSD: if_rgereg.h,v 1.7 2022/12/21 05:19:15 nonaka Exp $ */
/* $OpenBSD: if_rgereg.h,v 1.6 2020/12/24 01:00:00 kevlo Exp $ */
/*
@@ -188,9 +188,10 @@
#define RGE_NEXT_RX_DESC(x) (((x) + 1) % RGE_RX_LIST_CNT)
#define RGE_ADDR_LO(y) ((uint64_t) (y) & 0x)
#define RGE_ADDR_HI(y) ((uint64_t) (y) >> 32)
-#define RGE_OWN(x) (letoh32((x)->rge_cmdsts) & RGE_RDCMDSTS_OWN)
-#define RGE_RXBYTES(x) (letoh32((x)->rge_cmdsts) & \
-RGE_RDCMDSTS_FRAGLEN)
+#define RGE_OWN(x) \
+
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nonaka Date: Wed Dec 21 05:19:15 UTC 2022 Modified Files: src/sys/dev/pci: if_rge.c if_rgereg.h Log Message: Update the Rx descriptor based on the vendor driver for Linux. This fixes a panic on RTL8125. Patch from OpenBSD if_rge.c r1.20, if_rgereg.h r1.8. Tested by msaitoh@n.o. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_rge.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/if_rgereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src Committed By: chs Date: Wed Dec 21 02:28:06 UTC 2022 Modified Files: src/sys/uvm: uvm_swap.c Log Message: swap: disallow user opens of swap block device the swap/drum block device was never intended to allow user opens, but when the internal VOP_OPEN() in uvm_swap_init() was added back in rev 1.135, the d_open method was changed from always-fail to always-succeed in order to allow the new initial internal open. this had the side effect of incorrectly allowing user opens too. fix this by replacing the swap_bdevsw d_open with one that succeeds for the first call but fails for all subsequent calls. Reported-by: syzbot+90a23d2f19e5a0a30...@syzkaller.appspotmail.com To generate a diff of this commit: cvs rdiff -u -r1.206 -r1.207 src/sys/uvm/uvm_swap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src
Committed By: chs
Date: Wed Dec 21 02:28:06 UTC 2022
Modified Files:
src/sys/uvm: uvm_swap.c
Log Message:
swap: disallow user opens of swap block device
the swap/drum block device was never intended to allow user opens,
but when the internal VOP_OPEN() in uvm_swap_init() was added
back in rev 1.135, the d_open method was changed from always-fail
to always-succeed in order to allow the new initial internal open.
this had the side effect of incorrectly allowing user opens too.
fix this by replacing the swap_bdevsw d_open with one that succeeds
for the first call but fails for all subsequent calls.
Reported-by: syzbot+90a23d2f19e5a0a30...@syzkaller.appspotmail.com
To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/sys/uvm/uvm_swap.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/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.206 src/sys/uvm/uvm_swap.c:1.207
--- src/sys/uvm/uvm_swap.c:1.206 Mon Aug 23 13:08:18 2021
+++ src/sys/uvm/uvm_swap.c Wed Dec 21 02:28:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.c,v 1.206 2021/08/23 13:08:18 hannken Exp $ */
+/* $NetBSD: uvm_swap.c,v 1.207 2022/12/21 02:28:06 chs Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.206 2021/08/23 13:08:18 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.207 2022/12/21 02:28:06 chs Exp $");
#include "opt_uvmhist.h"
#include "opt_compat_netbsd.h"
@@ -1190,6 +1190,22 @@ again:
*/
/*
+ * swopen: allow the initial open from uvm_swap_init() and reject all others.
+ */
+
+static int
+swopen(dev_t dev, int flag, int mode, struct lwp *l)
+{
+ static bool inited = false;
+
+ if (!inited) {
+ inited = true;
+ return 0;
+ }
+ return ENODEV;
+}
+
+/*
* swstrategy: perform I/O on the drum
*
* => we must map the i/o request from the drum to the correct swapdev.
@@ -1308,8 +1324,8 @@ swwrite(dev_t dev, struct uio *uio, int
}
const struct bdevsw swap_bdevsw = {
- .d_open = nullopen,
- .d_close = nullclose,
+ .d_open = swopen,
+ .d_close = noclose,
.d_strategy = swstrategy,
.d_ioctl = noioctl,
.d_dump = nodump,
CVS commit: src/share/locale/ctype
Module Name:src Committed By: wiz Date: Tue Dec 20 23:08:51 UTC 2022 Modified Files: src/share/locale/ctype: en_US.UTF-8.src Log Message: Update Unicode tables. These tables are for Unicode 14.0.0 using the data provided with perl 5.36.0. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/locale/ctype/en_US.UTF-8.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/locale/ctype/en_US.UTF-8.src diff -u src/share/locale/ctype/en_US.UTF-8.src:1.8 src/share/locale/ctype/en_US.UTF-8.src:1.9 --- src/share/locale/ctype/en_US.UTF-8.src:1.8 Tue Dec 20 23:06:08 2022 +++ src/share/locale/ctype/en_US.UTF-8.src Tue Dec 20 23:08:51 2022 @@ -1,5 +1,4 @@ -/* $NetBSD: en_US.UTF-8.src,v 1.8 2022/12/20 23:06:08 wiz Exp $ */ -/* $OpenBSD: en_US.UTF-8.src,v 1.12 2021/05/16 22:48:05 afresh1 Exp $ */ +/* $NetBSD: en_US.UTF-8.src,v 1.9 2022/12/20 23:08:51 wiz Exp $ */ /* * COPYRIGHT AND PERMISSION NOTICE @@ -41,7 +40,7 @@ ENCODING"UTF8" VARIABLECODESET=UTF-8 -/* Unicode Version 13.0.0 */ +/* Unicode Version 14.0.0 */ /* * U+ - U+007F : Basic Latin @@ -907,14 +906,14 @@ ALPHA 0x06d5 - 0x06dc 0x06e1 - 0x06 ALPHA 0x06ff CONTROL 0x061c DIGIT 0x0660 - 0x0669 0x06f0 - 0x06f9 -GRAPH 0x0600 - 0x061c 0x061e - 0x06ff -PUNCT 0x0606 - 0x060f 0x061b 0x061e - 0x061f 0x066a - 0x066d 0x06d4 +GRAPH 0x0600 - 0x06ff +PUNCT 0x0606 - 0x060f 0x061b 0x061d - 0x061f 0x066a - 0x066d 0x06d4 PUNCT 0x06de 0x06e9 0x06fd - 0x06fe -PRINT 0x0600 - 0x061c 0x061e - 0x06ff +PRINT 0x0600 - 0x06ff SPECIAL 0x0600 - 0x0605 0x0658 0x06dd 0x06df - 0x06e0 0x06ea - 0x06ec SWIDTH0 0x0600 - 0x0605 0x0610 - 0x061a 0x061c 0x064b - 0x065f 0x0670 SWIDTH0 0x06d6 - 0x06dd 0x06df - 0x06e4 0x06e7 - 0x06e8 0x06ea - 0x06ed -SWIDTH1 0x0606 - 0x060f 0x061b 0x061e - 0x064a 0x0660 - 0x066f +SWIDTH1 0x0606 - 0x060f 0x061b 0x061d - 0x064a 0x0660 - 0x066f SWIDTH1 0x0671 - 0x06d5 0x06de 0x06e5 - 0x06e6 0x06e9 0x06ee - 0x06ff TODIGIT < 0x0660 - 0x0669 : 0x > @@ -1006,21 +1005,28 @@ SWIDTH1 0x0860 - 0x086a /* - * U+0870 - U+089F : No_Block + * U+0870 - U+089F : Arabic Extended-B */ +ALPHA 0x0870 - 0x0887 0x0889 - 0x088e +GRAPH 0x0870 - 0x088e 0x0890 - 0x0891 0x0898 - 0x089f +PUNCT 0x0888 +PRINT 0x0870 - 0x088e 0x0890 - 0x0891 0x0898 - 0x089f +SPECIAL 0x0890 - 0x0891 0x0898 - 0x089f +SWIDTH0 0x0890 - 0x0891 0x0898 - 0x089f +SWIDTH1 0x0870 - 0x088e + /* * U+08A0 - U+08FF : Arabic Extended-A */ -ALPHA 0x08a0 - 0x08b4 0x08b6 - 0x08c7 0x08d4 - 0x08df 0x08e3 - 0x08e9 -ALPHA 0x08f0 - 0x08ff -GRAPH 0x08a0 - 0x08b4 0x08b6 - 0x08c7 0x08d3 - 0x08ff -PRINT 0x08a0 - 0x08b4 0x08b6 - 0x08c7 0x08d3 - 0x08ff -SPECIAL 0x08d3 0x08e0 - 0x08e2 0x08ea - 0x08ef -SWIDTH0 0x08d3 - 0x08ff -SWIDTH1 0x08a0 - 0x08b4 0x08b6 - 0x08c7 +ALPHA 0x08a0 - 0x08c9 0x08d4 - 0x08df 0x08e3 - 0x08e9 0x08f0 - 0x08ff +GRAPH 0x08a0 - 0x08ff +PRINT 0x08a0 - 0x08ff +SPECIAL 0x08ca - 0x08d3 0x08e0 - 0x08e2 0x08ea - 0x08ef +SWIDTH0 0x08ca - 0x08ff +SWIDTH1 0x08a0 - 0x08c9 /* @@ -1188,20 +1194,22 @@ TODIGIT < 0x0bf2 1000 > ALPHA 0x0c00 - 0x0c03 0x0c05 - 0x0c0c 0x0c0e - 0x0c10 0x0c12 - 0x0c28 ALPHA 0x0c2a - 0x0c39 0x0c3d - 0x0c44 0x0c46 - 0x0c48 0x0c4a - 0x0c4c -ALPHA 0x0c55 - 0x0c56 0x0c58 - 0x0c5a 0x0c60 - 0x0c63 +ALPHA 0x0c55 - 0x0c56 0x0c58 - 0x0c5a 0x0c5d 0x0c60 - 0x0c63 DIGIT 0x0c66 - 0x0c6f GRAPH 0x0c00 - 0x0c0c 0x0c0e - 0x0c10 0x0c12 - 0x0c28 0x0c2a - 0x0c39 -GRAPH 0x0c3d - 0x0c44 0x0c46 - 0x0c48 0x0c4a - 0x0c4d 0x0c55 - 0x0c56 -GRAPH 0x0c58 - 0x0c5a 0x0c60 - 0x0c63 0x0c66 - 0x0c6f 0x0c77 - 0x0c7f +GRAPH 0x0c3c - 0x0c44 0x0c46 - 0x0c48 0x0c4a - 0x0c4d 0x0c55 - 0x0c56 +GRAPH 0x0c58 - 0x0c5a 0x0c5d 0x0c60 - 0x0c63 0x0c66 - 0x0c6f +GRAPH 0x0c77 - 0x0c7f PUNCT 0x0c77 0x0c7f PRINT 0x0c00 - 0x0c0c 0x0c0e - 0x0c10 0x0c12 - 0x0c28 0x0c2a - 0x0c39 -PRINT 0x0c3d - 0x0c44 0x0c46 - 0x0c48 0x0c4a - 0x0c4d 0x0c55 - 0x0c56 -PRINT 0x0c58 - 0x0c5a 0x0c60 - 0x0c63 0x0c66 - 0x0c6f 0x0c77 - 0x0c7f -SPECIAL 0x0c04 0x0c4d 0x0c78 - 0x0c7e -SWIDTH0 0x0c00 0x0c04 0x0c3e - 0x0c40 0x0c46 - 0x0c48 0x0c4a - 0x0c4d -SWIDTH0 0x0c55 - 0x0c56 0x0c62 - 0x0c63 +PRINT 0x0c3c - 0x0c44 0x0c46 - 0x0c48 0x0c4a - 0x0c4d 0x0c55 - 0x0c56 +PRINT 0x0c58 - 0x0c5a 0x0c5d 0x0c60 - 0x0c63 0x0c66 - 0x0c6f +PRINT 0x0c77 - 0x0c7f +SPECIAL 0x0c04 0x0c3c 0x0c4d 0x0c78 - 0x0c7e +SWIDTH0 0x0c00 0x0c04 0x0c3c 0x0c3e - 0x0c40 0x0c46 - 0x0c48 +SWIDTH0 0x0c4a - 0x0c4d 0x0c55 - 0x0c56 0x0c62 - 0x0c63 SWIDTH1 0x0c01 - 0x0c03 0x0c05 - 0x0c0c 0x0c0e - 0x0c10 0x0c12 - 0x0c28 -SWIDTH1 0x0c2a - 0x0c39 0x0c3d 0x0c41 - 0x0c44 0x0c58 - 0x0c5a +SWIDTH1
CVS commit: src/share/locale/ctype
Module Name:src Committed By: wiz Date: Tue Dec 20 23:08:51 UTC 2022 Modified Files: src/share/locale/ctype: en_US.UTF-8.src Log Message: Update Unicode tables. These tables are for Unicode 14.0.0 using the data provided with perl 5.36.0. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/locale/ctype/en_US.UTF-8.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/locale/ctype
Module Name:src Committed By: wiz Date: Tue Dec 20 23:07:57 UTC 2022 Modified Files: src/share/locale/ctype: gen_ctype_utf8.pl Log Message: Add NetBSD RCS Id header instead of OpenBSD one. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/locale/ctype/gen_ctype_utf8.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/locale/ctype
Module Name:src
Committed By: wiz
Date: Tue Dec 20 23:07:57 UTC 2022
Modified Files:
src/share/locale/ctype: gen_ctype_utf8.pl
Log Message:
Add NetBSD RCS Id header instead of OpenBSD one.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/locale/ctype/gen_ctype_utf8.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/locale/ctype/gen_ctype_utf8.pl
diff -u src/share/locale/ctype/gen_ctype_utf8.pl:1.1 src/share/locale/ctype/gen_ctype_utf8.pl:1.2
--- src/share/locale/ctype/gen_ctype_utf8.pl:1.1 Tue Dec 20 23:06:08 2022
+++ src/share/locale/ctype/gen_ctype_utf8.pl Tue Dec 20 23:07:57 2022
@@ -47,7 +47,7 @@ my @maps = qw(
my ( $blocks_ranges_ref, $blocks_maps_ref ) = prop_invmap("Block");
-print "/*\t\$" . 'OpenBSD' . "\$\t*/\n";
+print "/*\t\$" . 'NetBSD' . "\$\t*/\n";
print <<'EOL';
/*
CVS commit: src/share/locale/ctype
Module Name:src Committed By: wiz Date: Tue Dec 20 23:06:08 UTC 2022 Modified Files: src/share/locale/ctype: en_US.UTF-8.src Added Files: src/share/locale/ctype: gen_ctype_utf8.pl Log Message: Update unicode tables. This version of the file, and the generator script, come from OpenBSD. The script was written by Andrew Fresh. The file covers the encodings from Unicode 13.0.0, based on the files distributed with perl 5.32.1. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/locale/ctype/en_US.UTF-8.src cvs rdiff -u -r0 -r1.1 src/share/locale/ctype/gen_ctype_utf8.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Tue Dec 20 17:51:54 UTC 2022 Modified Files: src/bin/sh: sh.1 Log Message: More markup errors. \+ was intended to be \&+ and .EV .Ev of course. As best I can tell, the rest of what mandoc -Wall complains about is incorrect (it could probably be avoided by adding more markup, but there doesn't seem to be any point). To generate a diff of this commit: cvs rdiff -u -r1.254 -r1.255 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/sh/sh.1 diff -u src/bin/sh/sh.1:1.254 src/bin/sh/sh.1:1.255 --- src/bin/sh/sh.1:1.254 Tue Dec 20 16:48:57 2022 +++ src/bin/sh/sh.1 Tue Dec 20 17:51:54 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: sh.1,v 1.254 2022/12/20 16:48:57 kre Exp $ +.\" $NetBSD: sh.1,v 1.255 2022/12/20 17:51:54 kre Exp $ .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -122,7 +122,7 @@ When first starting, if neither the .Fl l nor -.Cm \+l +.Cm \&+l options were given on the command line, the shell inspects argument 0, and if it begins with a dash .Sq \- , @@ -1782,7 +1782,7 @@ field with the value of each parameter s the .Ev IFS variable (possibly nothing if -.EV IFS +.Ev IFS has a null value), or by a .Aq space if
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Tue Dec 20 17:51:54 UTC 2022 Modified Files: src/bin/sh: sh.1 Log Message: More markup errors. \+ was intended to be \&+ and .EV .Ev of course. As best I can tell, the rest of what mandoc -Wall complains about is incorrect (it could probably be avoided by adding more markup, but there doesn't seem to be any point). To generate a diff of this commit: cvs rdiff -u -r1.254 -r1.255 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Tue Dec 20 16:48:57 UTC 2022 Modified Files: src/bin/sh: sh.1 Log Message: Using .Cm Cm makes no sense at all - no idea what I was thinking there (perhaps just an editing error). To generate a diff of this commit: cvs rdiff -u -r1.253 -r1.254 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/sh/sh.1 diff -u src/bin/sh/sh.1:1.253 src/bin/sh/sh.1:1.254 --- src/bin/sh/sh.1:1.253 Tue Dec 20 01:18:42 2022 +++ src/bin/sh/sh.1 Tue Dec 20 16:48:57 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: sh.1,v 1.253 2022/12/20 01:18:42 uwe Exp $ +.\" $NetBSD: sh.1,v 1.254 2022/12/20 16:48:57 kre Exp $ .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -424,7 +424,7 @@ a login shell. When reset on the command line .Po Cm \&+l or -.Cm Cm \&+o Em login Pc , +.Cm \&+o Em login Pc , the shell will not be considered a login shell, even if the command name parameter .Po Va argv[0] Pc
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Tue Dec 20 16:48:57 UTC 2022 Modified Files: src/bin/sh: sh.1 Log Message: Using .Cm Cm makes no sense at all - no idea what I was thinking there (perhaps just an editing error). To generate a diff of this commit: cvs rdiff -u -r1.253 -r1.254 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Dec 20 09:58:02 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1555 To generate a diff of this commit: cvs rdiff -u -r1.1.2.31 -r1.1.2.32 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.31 src/doc/CHANGES-9.4:1.1.2.32 --- src/doc/CHANGES-9.4:1.1.2.31 Wed Dec 14 15:41:43 2022 +++ src/doc/CHANGES-9.4 Tue Dec 20 09:58:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.31 2022/12/14 15:41:43 snj Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.32 2022/12/20 09:58:01 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -473,3 +473,8 @@ usr.sbin/sysinst/arch/sparc64/md.c 1.8 architectures. [martin, ticket #1554] +sys/nfs/nfs_srvsocket.c1.5 + + NFS: avoid mbuf leaks and corruption. + [hannken, ticket #1555] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Dec 20 09:58:02 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1555 To generate a diff of this commit: cvs rdiff -u -r1.1.2.31 -r1.1.2.32 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/nfs
Module Name:src
Committed By: martin
Date: Tue Dec 20 09:56:28 UTC 2022
Modified Files:
src/sys/nfs [netbsd-9]: nfs_srvsocket.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #1555):
sys/nfs/nfs_srvsocket.c: revision 1.5
When partitioning a mbuf chain with m_split() the last mbuf of the returned
tail chain is not necessarily the same as the last mbuf of the initial chain.
Always set "slp->ns_rawend" to the last mbuf of the tail chain to prevent
mbuf leaks and corruption.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.68.1 src/sys/nfs/nfs_srvsocket.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/nfs/nfs_srvsocket.c
diff -u src/sys/nfs/nfs_srvsocket.c:1.4 src/sys/nfs/nfs_srvsocket.c:1.4.68.1
--- src/sys/nfs/nfs_srvsocket.c:1.4 Thu Sep 3 20:59:12 2009
+++ src/sys/nfs/nfs_srvsocket.c Tue Dec 20 09:56:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_srvsocket.c,v 1.4 2009/09/03 20:59:12 tls Exp $ */
+/* $NetBSD: nfs_srvsocket.c,v 1.4.68.1 2022/12/20 09:56:28 martin Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.4 2009/09/03 20:59:12 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.4.68.1 2022/12/20 09:56:28 martin Exp $");
#include
#include
@@ -323,8 +323,9 @@ nfsrv_getstream(struct nfssvc_sock *slp,
}
m_claimm(recm, _mowner);
slp->ns_raw = m;
- if (m->m_next == NULL)
-slp->ns_rawend = m;
+ while (m->m_next)
+m = m->m_next;
+ slp->ns_rawend = m;
slp->ns_cc -= slp->ns_reclen;
slp->ns_reclen = 0;
} else {
CVS commit: [netbsd-9] src/sys/nfs
Module Name:src Committed By: martin Date: Tue Dec 20 09:56:28 UTC 2022 Modified Files: src/sys/nfs [netbsd-9]: nfs_srvsocket.c Log Message: Pull up following revision(s) (requested by hannken in ticket #1555): sys/nfs/nfs_srvsocket.c: revision 1.5 When partitioning a mbuf chain with m_split() the last mbuf of the returned tail chain is not necessarily the same as the last mbuf of the initial chain. Always set "slp->ns_rawend" to the last mbuf of the tail chain to prevent mbuf leaks and corruption. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.68.1 src/sys/nfs/nfs_srvsocket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Dec 20 09:55:19 UTC 2022 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #7 - #12 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Dec 20 09:55:19 UTC 2022 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #7 - #12 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.2 src/doc/CHANGES-10.0:1.1.2.3 --- src/doc/CHANGES-10.0:1.1.2.2 Mon Dec 19 14:00:35 2022 +++ src/doc/CHANGES-10.0 Tue Dec 20 09:55:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.2 2022/12/19 14:00:35 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.3 2022/12/20 09:55:19 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -112,4 +112,185 @@ xsrc/external/mit/makedepend/dist/makede makedepend(1): revert local change, update to 1.0.8 instead. [mrg, ticket #6] +external/mit/libX11/dist/ChangeLog up to 1.3 +external/mit/libX11/dist/README.md up to 1.3 +external/mit/libX11/dist/aclocal.m4 up to 1.3 +external/mit/libX11/dist/configure up to 1.3 +external/mit/libX11/dist/configure.ac up to 1.3 +external/mit/libX11/dist/include/X11/Xlib.h up to 1.3 +external/mit/libX11/dist/include/X11/Xlibint.h up to 1.3 +external/mit/libX11/dist/man/XInitThreads.man up to 1.3 +external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c up to 1.3 +external/mit/libX11/dist/nls/en_US.UTF-8/XLC_LOCALE.pre up to 1.3 +external/mit/libX11/dist/src/ChkIfEv.c up to 1.3 +external/mit/libX11/dist/src/IfEvent.c up to 1.3 +external/mit/libX11/dist/src/OpenDis.c up to 1.3 +external/mit/libX11/dist/src/PeekIfEv.c up to 1.3 +external/mit/libX11/dist/src/PutBEvent.cup to 1.3 +external/mit/libX11/dist/src/globals.c up to 1.3 +external/mit/libX11/dist/src/locking.c up to 1.3 +external/mit/libX11/dist/src/xkb/XKBBind.c up to 1.3 + + Update libX11 from 1.8.2 to 1.8.3. + [mrg, ticket #7] + +external/mit/xorg-server/dist/hw/xquartz/defaults.plist up to 1.1.1.1 +external/mit/xorg-server/dist/m4/libtool.m4 delete +external/mit/xorg-server/dist/m4/ltversion.m4 delete +external/mit/xorg-server/dist/ChangeLog up to 1.1.1.21 +external/mit/xorg-server/dist/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/aclocal.m4up to 1.1.1.18 +external/mit/xorg-server/dist/compile up to 1.1.1.12 +external/mit/xorg-server/dist/config.guess up to 1.1.1.14 +external/mit/xorg-server/dist/config.subup to 1.1.1.14 +external/mit/xorg-server/dist/configure up to 1.14 +external/mit/xorg-server/dist/configure.ac up to 1.16 +external/mit/xorg-server/dist/depcomp up to 1.1.1.10 +external/mit/xorg-server/dist/ltmain.sh up to 1.1.1.12 +external/mit/xorg-server/dist/meson.build up to 1.1.1.11 +external/mit/xorg-server/dist/missing up to 1.1.1.10 +external/mit/xorg-server/dist/test-driver up to 1.1.1.8 +external/mit/xorg-server/dist/ylwrapup to 1.1.1.10 +external/mit/xorg-server/dist/Xext/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/Xext/saver.c up to 1.5 +external/mit/xorg-server/dist/Xext/xtest.c up to 1.8 +external/mit/xorg-server/dist/Xext/xvmain.c up to 1.1.1.7 +external/mit/xorg-server/dist/Xi/Makefile.inup to 1.1.1.15 +external/mit/xorg-server/dist/Xi/sendexev.c up to 1.6 +external/mit/xorg-server/dist/Xi/xipassivegrab.c up to 1.7 +external/mit/xorg-server/dist/Xi/xiproperty.c up to 1.6 +external/mit/xorg-server/dist/composite/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/config/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/damageext/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/dbe/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/dix/Makefile.in up to 1.1.1.16 +external/mit/xorg-server/dist/dix/property.cup to 1.1.1.8 +external/mit/xorg-server/dist/doc/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/doc/dtrace/Makefile.in up to 1.1.1.9 +external/mit/xorg-server/dist/dri3/Makefile.in up to 1.1.1.9 +external/mit/xorg-server/dist/exa/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/fb/Makefile.inup to 1.1.1.15 +external/mit/xorg-server/dist/glamor/Makefile.in up to 1.1.1.9 +external/mit/xorg-server/dist/glx/Makefile.in up to 1.1.1.14 +external/mit/xorg-server/dist/hw/Makefile.inup to 1.1.1.15 +external/mit/xorg-server/dist/hw/kdrive/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/hw/kdrive/ephyr/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/hw/kdrive/ephyr/man/Makefile.in up to 1.1.1.11 +external/mit/xorg-server/dist/hw/kdrive/src/Makefile.in up to 1.1.1.15 +external/mit/xorg-server/dist/hw/vfb/Makefile.in up to 1.1.1.15
CVS commit: [netbsd-10] src/sys/nfs
Module Name:src
Committed By: martin
Date: Tue Dec 20 09:54:11 UTC 2022
Modified Files:
src/sys/nfs [netbsd-10]: nfs_srvsocket.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #12):
sys/nfs/nfs_srvsocket.c: revision 1.5
When partitioning a mbuf chain with m_split() the last mbuf of the returned
tail chain is not necessarily the same as the last mbuf of the initial chain.
Always set "slp->ns_rawend" to the last mbuf of the tail chain to prevent
mbuf leaks and corruption.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.94.1 src/sys/nfs/nfs_srvsocket.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/nfs/nfs_srvsocket.c
diff -u src/sys/nfs/nfs_srvsocket.c:1.4 src/sys/nfs/nfs_srvsocket.c:1.4.94.1
--- src/sys/nfs/nfs_srvsocket.c:1.4 Thu Sep 3 20:59:12 2009
+++ src/sys/nfs/nfs_srvsocket.c Tue Dec 20 09:54:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_srvsocket.c,v 1.4 2009/09/03 20:59:12 tls Exp $ */
+/* $NetBSD: nfs_srvsocket.c,v 1.4.94.1 2022/12/20 09:54:11 martin Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.4 2009/09/03 20:59:12 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.4.94.1 2022/12/20 09:54:11 martin Exp $");
#include
#include
@@ -323,8 +323,9 @@ nfsrv_getstream(struct nfssvc_sock *slp,
}
m_claimm(recm, _mowner);
slp->ns_raw = m;
- if (m->m_next == NULL)
-slp->ns_rawend = m;
+ while (m->m_next)
+m = m->m_next;
+ slp->ns_rawend = m;
slp->ns_cc -= slp->ns_reclen;
slp->ns_reclen = 0;
} else {
CVS commit: [netbsd-10] src/sys/nfs
Module Name:src Committed By: martin Date: Tue Dec 20 09:54:11 UTC 2022 Modified Files: src/sys/nfs [netbsd-10]: nfs_srvsocket.c Log Message: Pull up following revision(s) (requested by hannken in ticket #12): sys/nfs/nfs_srvsocket.c: revision 1.5 When partitioning a mbuf chain with m_split() the last mbuf of the returned tail chain is not necessarily the same as the last mbuf of the initial chain. Always set "slp->ns_rawend" to the last mbuf of the tail chain to prevent mbuf leaks and corruption. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.94.1 src/sys/nfs/nfs_srvsocket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/bin/sh
Module Name:src Committed By: martin Date: Tue Dec 20 09:51:47 UTC 2022 Modified Files: src/bin/sh [netbsd-10]: sh.1 Log Message: Pull up following revision(s) (requested by uwe in ticket #11): bin/sh/sh.1: revision 1.253 sh(1): Fix markup. -compact must be last. To generate a diff of this commit: cvs rdiff -u -r1.252 -r1.252.2.1 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/bin/sh
Module Name:src Committed By: martin Date: Tue Dec 20 09:51:47 UTC 2022 Modified Files: src/bin/sh [netbsd-10]: sh.1 Log Message: Pull up following revision(s) (requested by uwe in ticket #11): bin/sh/sh.1: revision 1.253 sh(1): Fix markup. -compact must be last. To generate a diff of this commit: cvs rdiff -u -r1.252 -r1.252.2.1 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/sh/sh.1 diff -u src/bin/sh/sh.1:1.252 src/bin/sh/sh.1:1.252.2.1 --- src/bin/sh/sh.1:1.252 Sun Dec 11 08:23:10 2022 +++ src/bin/sh/sh.1 Tue Dec 20 09:51:47 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: sh.1,v 1.252 2022/12/11 08:23:10 kre Exp $ +.\" $NetBSD: sh.1,v 1.252.2.1 2022/12/20 09:51:47 martin Exp $ .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -2767,7 +2767,7 @@ before the command is invoked. With the default value for .Dv IFS : -.Bd -unfilled -compact -offset indent +.Bd -unfilled -offset indent -compact X='a b c' export Y=$X .Ed @@ -4752,7 +4752,7 @@ in the circumstances described. Any present will always appear in ASCII lexical order, as they appear below (to make testing the value easier to code). .Pp -.Bl -compact -tag -width M__ -offset indent +.Bl -tag -width M__ -offset indent -compact .It \&! Always present when set by .Nm ,
CVS commit: [netbsd-10] src/sbin/tunefs
Module Name:src
Committed By: martin
Date: Tue Dec 20 09:50:39 UTC 2022
Modified Files:
src/sbin/tunefs [netbsd-10]: tunefs.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #10):
sbin/tunefs/tunefs.c: revision 1.57
tunefs: clarify that "-a" refers to NFSv4 ACLs
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.2.1 src/sbin/tunefs/tunefs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/tunefs/tunefs.c
diff -u src/sbin/tunefs/tunefs.c:1.56 src/sbin/tunefs/tunefs.c:1.56.2.1
--- src/sbin/tunefs/tunefs.c:1.56 Thu Nov 17 06:40:39 2022
+++ src/sbin/tunefs/tunefs.c Tue Dec 20 09:50:39 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tunefs.c,v 1.56 2022/11/17 06:40:39 chs Exp $ */
+/* $NetBSD: tunefs.c,v 1.56.2.1 2022/12/20 09:50:39 martin Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)tunefs.c 8.3 (Berkeley) 5/3/95";
#else
-__RCSID("$NetBSD: tunefs.c,v 1.56 2022/11/17 06:40:39 chs Exp $");
+__RCSID("$NetBSD: tunefs.c,v 1.56.2.1 2022/12/20 09:50:39 martin Exp $");
#endif
#endif /* not lint */
@@ -360,7 +360,7 @@ main(int argc, char *argv[])
* be cleared by kernel or fsck.
*/
if (aflag) {
- name = "ACLs";
+ name = "NFSv4 ACLs";
if (strcmp(avalue, "enable") == 0) {
if (is_ufs2 && !extattr) {
warnx("%s not supported by this fs", name);
CVS commit: [netbsd-10] src/sbin/tunefs
Module Name:src Committed By: martin Date: Tue Dec 20 09:50:39 UTC 2022 Modified Files: src/sbin/tunefs [netbsd-10]: tunefs.c Log Message: Pull up following revision(s) (requested by chs in ticket #10): sbin/tunefs/tunefs.c: revision 1.57 tunefs: clarify that "-a" refers to NFSv4 ACLs To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.56.2.1 src/sbin/tunefs/tunefs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/dumpfs
Module Name:src Committed By: martin Date: Tue Dec 20 09:49:21 UTC 2022 Modified Files: src/usr.sbin/dumpfs [netbsd-10]: dumpfs.8 dumpfs.c Log Message: Pull up following revision(s) (requested by chs in ticket #9): usr.sbin/dumpfs/dumpfs.c: revision 1.67 usr.sbin/dumpfs/dumpfs.8: revision 1.21 dumpfs: remove confusing output for UFS2 remove the mention of "fslevel 5" because no such thing exists. the whole "fs level" concept really only applies to UFS1, so don't print the line with the level number and details for UFS2 file systems at all. try to clarify this in the manpage as well. prompted by PR 57082. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.56.1 src/usr.sbin/dumpfs/dumpfs.8 cvs rdiff -u -r1.66 -r1.66.2.1 src/usr.sbin/dumpfs/dumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/dumpfs
Module Name:src
Committed By: martin
Date: Tue Dec 20 09:49:21 UTC 2022
Modified Files:
src/usr.sbin/dumpfs [netbsd-10]: dumpfs.8 dumpfs.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #9):
usr.sbin/dumpfs/dumpfs.c: revision 1.67
usr.sbin/dumpfs/dumpfs.8: revision 1.21
dumpfs: remove confusing output for UFS2
remove the mention of "fslevel 5" because no such thing exists.
the whole "fs level" concept really only applies to UFS1, so don't print
the line with the level number and details for UFS2 file systems at all.
try to clarify this in the manpage as well.
prompted by PR 57082.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.56.1 src/usr.sbin/dumpfs/dumpfs.8
cvs rdiff -u -r1.66 -r1.66.2.1 src/usr.sbin/dumpfs/dumpfs.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/dumpfs/dumpfs.8
diff -u src/usr.sbin/dumpfs/dumpfs.8:1.20 src/usr.sbin/dumpfs/dumpfs.8:1.20.56.1
--- src/usr.sbin/dumpfs/dumpfs.8:1.20 Sat Feb 27 10:49:42 2010
+++ src/usr.sbin/dumpfs/dumpfs.8 Tue Dec 20 09:49:21 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: dumpfs.8,v 1.20 2010/02/27 10:49:42 wiz Exp $
+.\" $NetBSD: dumpfs.8,v 1.20.56.1 2022/12/20 09:49:21 martin Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -80,7 +80,7 @@ defaults to
.Nm
is useful mostly for finding out certain file system
information such as the file system block size, minimum
-free space percentage, and the file system level that
+free space percentage, and (for FFSv1) the file system level that
can be upgraded with the
.Fl c
option of
Index: src/usr.sbin/dumpfs/dumpfs.c
diff -u src/usr.sbin/dumpfs/dumpfs.c:1.66 src/usr.sbin/dumpfs/dumpfs.c:1.66.2.1
--- src/usr.sbin/dumpfs/dumpfs.c:1.66 Thu Nov 17 06:40:40 2022
+++ src/usr.sbin/dumpfs/dumpfs.c Tue Dec 20 09:49:21 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dumpfs.c,v 1.66 2022/11/17 06:40:40 chs Exp $ */
+/* $NetBSD: dumpfs.c,v 1.66.2.1 2022/12/20 09:49:21 martin Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95";
#else
-__RCSID("$NetBSD: dumpfs.c,v 1.66 2022/11/17 06:40:40 chs Exp $");
+__RCSID("$NetBSD: dumpfs.c,v 1.66.2.1 2022/12/20 09:49:21 martin Exp $");
#endif
#endif /* not lint */
@@ -314,7 +314,7 @@ print_superblock(struct fs *fs, uint16_t
fs->fs_magic, ctime());
if (is_ufs2)
- i = 5;
+ i = -1;
else {
i = 0;
if (fs->fs_old_postblformat != FS_42POSTBLFMT) {
@@ -338,10 +338,11 @@ print_superblock(struct fs *fs, uint16_t
fs->fs_id[0] || fs->fs_id[1])
printf("superblock location\t%jd\tid\t[ %x %x ]\n",
(intmax_t)fs->fs_sblockloc, fs->fs_id[0], fs->fs_id[1]);
- printf("cylgrp\t%s\tinodes\t%s\tsblock\t%s\tfslevel %d\n",
- i < 1 ? "static" : "dynamic",
- i < 2 ? "4.2/4.3BSD" : i < 5 ? "4.4BSD" : "FFSv2",
- i < 4 ? "FFSv1" : "FFSv2", i);
+ if (!is_ufs2)
+ printf("cylgrp\t%s\tinodes\t%s\tsblock\t%s\tfslevel %d\n",
+ i < 1 ? "static" : "dynamic",
+ i < 2 ? "4.2/4.3BSD" : i < 5 ? "4.4BSD" : "FFSv2",
+ i < 4 ? "FFSv1" : "FFSv2", i);
printf("nbfree\t%lld\tndir\t%lld\tnifree\t%lld\tnffree\t%lld\n",
(long long)fs->fs_cstotal.cs_nbfree,
(long long)fs->fs_cstotal.cs_ndir,
CVS commit: [netbsd-10] xsrc/external/mit/xorg-server
Module Name:xsrc Committed By: martin Date: Tue Dec 20 09:44:30 UTC 2022 Modified Files: xsrc/external/mit/xorg-server/dist [netbsd-10]: ChangeLog Makefile.in aclocal.m4 compile config.guess config.sub configure configure.ac depcomp ltmain.sh meson.build missing test-driver ylwrap xsrc/external/mit/xorg-server/dist/Xext [netbsd-10]: Makefile.in saver.c xtest.c xvmain.c xsrc/external/mit/xorg-server/dist/Xi [netbsd-10]: Makefile.in sendexev.c xipassivegrab.c xiproperty.c xsrc/external/mit/xorg-server/dist/composite [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/config [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/damageext [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/dbe [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/dix [netbsd-10]: Makefile.in property.c xsrc/external/mit/xorg-server/dist/doc [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/doc/dtrace [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/dri3 [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/exa [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/fb [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/glamor [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/glx [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/kdrive [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/kdrive/ephyr [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/kdrive/ephyr/man [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/kdrive/src [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/vfb [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/vfb/man [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86 [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/common [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/dixmods [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/doc [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/dri [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/pci_ids [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/inputtest [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/exa [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/exa/man [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw/man [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/glamor_egl [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/i2c [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/int10 [netbsd-10]: Makefile.in generic.c xsrc/external/mit/xorg-server/dist/hw/xfree86/loader [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/man [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/modes [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/hurd [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/linux [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/misc [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/solaris [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/stub [netbsd-10]:
CVS commit: [netbsd-10] xsrc/external/mit/xorg-server
Module Name:xsrc Committed By: martin Date: Tue Dec 20 09:44:30 UTC 2022 Modified Files: xsrc/external/mit/xorg-server/dist [netbsd-10]: ChangeLog Makefile.in aclocal.m4 compile config.guess config.sub configure configure.ac depcomp ltmain.sh meson.build missing test-driver ylwrap xsrc/external/mit/xorg-server/dist/Xext [netbsd-10]: Makefile.in saver.c xtest.c xvmain.c xsrc/external/mit/xorg-server/dist/Xi [netbsd-10]: Makefile.in sendexev.c xipassivegrab.c xiproperty.c xsrc/external/mit/xorg-server/dist/composite [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/config [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/damageext [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/dbe [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/dix [netbsd-10]: Makefile.in property.c xsrc/external/mit/xorg-server/dist/doc [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/doc/dtrace [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/dri3 [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/exa [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/fb [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/glamor [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/glx [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/kdrive [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/kdrive/ephyr [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/kdrive/ephyr/man [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/kdrive/src [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/vfb [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/vfb/man [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86 [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/common [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/dixmods [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/doc [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/dri [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/pci_ids [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/inputtest [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/exa [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/exa/man [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw/man [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/glamor_egl [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/i2c [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/int10 [netbsd-10]: Makefile.in generic.c xsrc/external/mit/xorg-server/dist/hw/xfree86/loader [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/man [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/modes [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/hurd [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/linux [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/misc [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/solaris [netbsd-10]: Makefile.in xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/stub [netbsd-10]:
CVS commit: src/sys/nfs
Module Name:src
Committed By: hannken
Date: Tue Dec 20 09:40:09 UTC 2022
Modified Files:
src/sys/nfs: nfs_srvsocket.c
Log Message:
When partitioning a mbuf chain with m_split() the last mbuf of the returned
tail chain is not necessarily the same as the last mbuf of the initial chain.
Always set "slp->ns_rawend" to the last mbuf of the tail chain to prevent
mbuf leaks and corruption.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/nfs/nfs_srvsocket.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/nfs/nfs_srvsocket.c
diff -u src/sys/nfs/nfs_srvsocket.c:1.4 src/sys/nfs/nfs_srvsocket.c:1.5
--- src/sys/nfs/nfs_srvsocket.c:1.4 Thu Sep 3 20:59:12 2009
+++ src/sys/nfs/nfs_srvsocket.c Tue Dec 20 09:40:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_srvsocket.c,v 1.4 2009/09/03 20:59:12 tls Exp $ */
+/* $NetBSD: nfs_srvsocket.c,v 1.5 2022/12/20 09:40:09 hannken Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.4 2009/09/03 20:59:12 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.5 2022/12/20 09:40:09 hannken Exp $");
#include
#include
@@ -323,8 +323,9 @@ nfsrv_getstream(struct nfssvc_sock *slp,
}
m_claimm(recm, _mowner);
slp->ns_raw = m;
- if (m->m_next == NULL)
-slp->ns_rawend = m;
+ while (m->m_next)
+m = m->m_next;
+ slp->ns_rawend = m;
slp->ns_cc -= slp->ns_reclen;
slp->ns_reclen = 0;
} else {
CVS commit: src/sys/nfs
Module Name:src Committed By: hannken Date: Tue Dec 20 09:40:09 UTC 2022 Modified Files: src/sys/nfs: nfs_srvsocket.c Log Message: When partitioning a mbuf chain with m_split() the last mbuf of the returned tail chain is not necessarily the same as the last mbuf of the initial chain. Always set "slp->ns_rawend" to the last mbuf of the tail chain to prevent mbuf leaks and corruption. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/nfs/nfs_srvsocket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: martin Date: Tue Dec 20 09:36:52 UTC 2022 Modified Files: xsrc/external/mit/libX11/dist [netbsd-10]: ChangeLog README.md aclocal.m4 configure configure.ac xsrc/external/mit/libX11/dist/include/X11 [netbsd-10]: Xlib.h Xlibint.h xsrc/external/mit/libX11/dist/man [netbsd-10]: XInitThreads.man xsrc/external/mit/libX11/dist/modules/im/ximcp [netbsd-10]: imLcPrs.c xsrc/external/mit/libX11/dist/nls/en_US.UTF-8 [netbsd-10]: XLC_LOCALE.pre xsrc/external/mit/libX11/dist/src [netbsd-10]: ChkIfEv.c IfEvent.c OpenDis.c PeekIfEv.c PutBEvent.c globals.c locking.c xsrc/external/mit/libX11/dist/src/xkb [netbsd-10]: XKBBind.c Log Message: Sync external/mit/libX11/dist to HEAD, requested by mrg in ticket #7 external/mit/libX11/dist/ChangeLog up to 1.3 external/mit/libX11/dist/README.md up to 1.3 external/mit/libX11/dist/aclocal.m4 up to 1.3 external/mit/libX11/dist/configure up to 1.3 external/mit/libX11/dist/configure.ac up to 1.3 external/mit/libX11/dist/include/X11/Xlib.h up to 1.3 external/mit/libX11/dist/include/X11/Xlibint.h up to 1.3 external/mit/libX11/dist/man/XInitThreads.man up to 1.3 external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c up to 1.3 external/mit/libX11/dist/nls/en_US.UTF-8/XLC_LOCALE.pre up to 1.3 external/mit/libX11/dist/src/ChkIfEv.c up to 1.3 external/mit/libX11/dist/src/IfEvent.c up to 1.3 external/mit/libX11/dist/src/OpenDis.c up to 1.3 external/mit/libX11/dist/src/PeekIfEv.c up to 1.3 external/mit/libX11/dist/src/PutBEvent.cup to 1.3 external/mit/libX11/dist/src/globals.c up to 1.3 external/mit/libX11/dist/src/locking.c up to 1.3 external/mit/libX11/dist/src/xkb/XKBBind.c up to 1.3 Update libX11 from 1.8.2 to 1.8.3. To generate a diff of this commit: cvs rdiff -u -r1.1.1.27.2.2 -r1.1.1.27.2.3 \ xsrc/external/mit/libX11/dist/ChangeLog \ xsrc/external/mit/libX11/dist/configure \ xsrc/external/mit/libX11/dist/configure.ac cvs rdiff -u -r1.1.1.7.2.2 -r1.1.1.7.2.3 \ xsrc/external/mit/libX11/dist/README.md cvs rdiff -u -r1.1.1.23.2.2 -r1.1.1.23.2.3 \ xsrc/external/mit/libX11/dist/aclocal.m4 cvs rdiff -u -r1.1.1.12.2.2 -r1.1.1.12.2.3 \ xsrc/external/mit/libX11/dist/include/X11/Xlib.h cvs rdiff -u -r1.1.1.15.2.2 -r1.1.1.15.2.3 \ xsrc/external/mit/libX11/dist/include/X11/Xlibint.h cvs rdiff -u -r1.1.1.4.2.2 -r1.1.1.4.2.3 \ xsrc/external/mit/libX11/dist/man/XInitThreads.man cvs rdiff -u -r1.1.1.10.2.2 -r1.1.1.10.2.3 \ xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c cvs rdiff -u -r1.1.1.4.2.2 -r1.1.1.4.2.3 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XLC_LOCALE.pre cvs rdiff -u -r1.1.1.5.2.2 -r1.1.1.5.2.3 \ xsrc/external/mit/libX11/dist/src/ChkIfEv.c \ xsrc/external/mit/libX11/dist/src/IfEvent.c cvs rdiff -u -r1.1.1.14.2.2 -r1.1.1.14.2.3 \ xsrc/external/mit/libX11/dist/src/OpenDis.c cvs rdiff -u -r1.1.1.4.2.2 -r1.1.1.4.2.3 \ xsrc/external/mit/libX11/dist/src/PeekIfEv.c cvs rdiff -u -r1.1.1.6.2.2 -r1.1.1.6.2.3 \ xsrc/external/mit/libX11/dist/src/PutBEvent.c cvs rdiff -u -r1.1.1.9.2.2 -r1.1.1.9.2.3 \ xsrc/external/mit/libX11/dist/src/globals.c \ xsrc/external/mit/libX11/dist/src/locking.c cvs rdiff -u -r1.1.1.11.2.2 -r1.1.1.11.2.3 \ xsrc/external/mit/libX11/dist/src/xkb/XKBBind.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: martin
Date: Tue Dec 20 09:36:52 UTC 2022
Modified Files:
xsrc/external/mit/libX11/dist [netbsd-10]: ChangeLog README.md
aclocal.m4 configure configure.ac
xsrc/external/mit/libX11/dist/include/X11 [netbsd-10]: Xlib.h Xlibint.h
xsrc/external/mit/libX11/dist/man [netbsd-10]: XInitThreads.man
xsrc/external/mit/libX11/dist/modules/im/ximcp [netbsd-10]: imLcPrs.c
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8 [netbsd-10]:
XLC_LOCALE.pre
xsrc/external/mit/libX11/dist/src [netbsd-10]: ChkIfEv.c IfEvent.c
OpenDis.c PeekIfEv.c PutBEvent.c globals.c locking.c
xsrc/external/mit/libX11/dist/src/xkb [netbsd-10]: XKBBind.c
Log Message:
Sync external/mit/libX11/dist to HEAD, requested by mrg in ticket #7
external/mit/libX11/dist/ChangeLog up to 1.3
external/mit/libX11/dist/README.md up to 1.3
external/mit/libX11/dist/aclocal.m4 up to 1.3
external/mit/libX11/dist/configure up to 1.3
external/mit/libX11/dist/configure.ac up to 1.3
external/mit/libX11/dist/include/X11/Xlib.h up to 1.3
external/mit/libX11/dist/include/X11/Xlibint.h up to 1.3
external/mit/libX11/dist/man/XInitThreads.man up to 1.3
external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c up to 1.3
external/mit/libX11/dist/nls/en_US.UTF-8/XLC_LOCALE.pre up to 1.3
external/mit/libX11/dist/src/ChkIfEv.c up to 1.3
external/mit/libX11/dist/src/IfEvent.c up to 1.3
external/mit/libX11/dist/src/OpenDis.c up to 1.3
external/mit/libX11/dist/src/PeekIfEv.c up to 1.3
external/mit/libX11/dist/src/PutBEvent.cup to 1.3
external/mit/libX11/dist/src/globals.c up to 1.3
external/mit/libX11/dist/src/locking.c up to 1.3
external/mit/libX11/dist/src/xkb/XKBBind.c up to 1.3
Update libX11 from 1.8.2 to 1.8.3.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.27.2.2 -r1.1.1.27.2.3 \
xsrc/external/mit/libX11/dist/ChangeLog \
xsrc/external/mit/libX11/dist/configure \
xsrc/external/mit/libX11/dist/configure.ac
cvs rdiff -u -r1.1.1.7.2.2 -r1.1.1.7.2.3 \
xsrc/external/mit/libX11/dist/README.md
cvs rdiff -u -r1.1.1.23.2.2 -r1.1.1.23.2.3 \
xsrc/external/mit/libX11/dist/aclocal.m4
cvs rdiff -u -r1.1.1.12.2.2 -r1.1.1.12.2.3 \
xsrc/external/mit/libX11/dist/include/X11/Xlib.h
cvs rdiff -u -r1.1.1.15.2.2 -r1.1.1.15.2.3 \
xsrc/external/mit/libX11/dist/include/X11/Xlibint.h
cvs rdiff -u -r1.1.1.4.2.2 -r1.1.1.4.2.3 \
xsrc/external/mit/libX11/dist/man/XInitThreads.man
cvs rdiff -u -r1.1.1.10.2.2 -r1.1.1.10.2.3 \
xsrc/external/mit/libX11/dist/modules/im/ximcp/imLcPrs.c
cvs rdiff -u -r1.1.1.4.2.2 -r1.1.1.4.2.3 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XLC_LOCALE.pre
cvs rdiff -u -r1.1.1.5.2.2 -r1.1.1.5.2.3 \
xsrc/external/mit/libX11/dist/src/ChkIfEv.c \
xsrc/external/mit/libX11/dist/src/IfEvent.c
cvs rdiff -u -r1.1.1.14.2.2 -r1.1.1.14.2.3 \
xsrc/external/mit/libX11/dist/src/OpenDis.c
cvs rdiff -u -r1.1.1.4.2.2 -r1.1.1.4.2.3 \
xsrc/external/mit/libX11/dist/src/PeekIfEv.c
cvs rdiff -u -r1.1.1.6.2.2 -r1.1.1.6.2.3 \
xsrc/external/mit/libX11/dist/src/PutBEvent.c
cvs rdiff -u -r1.1.1.9.2.2 -r1.1.1.9.2.3 \
xsrc/external/mit/libX11/dist/src/globals.c \
xsrc/external/mit/libX11/dist/src/locking.c
cvs rdiff -u -r1.1.1.11.2.2 -r1.1.1.11.2.3 \
xsrc/external/mit/libX11/dist/src/xkb/XKBBind.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/ChangeLog
diff -u xsrc/external/mit/libX11/dist/ChangeLog:1.1.1.27.2.2 xsrc/external/mit/libX11/dist/ChangeLog:1.1.1.27.2.3
--- xsrc/external/mit/libX11/dist/ChangeLog:1.1.1.27.2.2 Mon Dec 19 13:22:42 2022
+++ xsrc/external/mit/libX11/dist/ChangeLog Tue Dec 20 09:36:50 2022
@@ -1,3 +1,125 @@
+commit 48487c4b9028e9eec5371742f51e1d64c2e17296
+Author: Alan Coopersmith
+Date: Thu Dec 15 14:52:20 2022 -0800
+
+libX11 1.8.3
+
+Signed-off-by: Alan Coopersmith
+
+commit d6d6cba90215d323567fef13d6565756c9956f60
+Author: Keith Packard
+Date: Sun Dec 11 10:32:26 2022 -0800
+
+Update XPutBackEvent() to support clients that put back unpadded events
+
+It seems to be common practice of some X11 clients to pass specific event
+types into APIs that take XEvent*. For example, freeglut does:
+
+ XConfigureEvent fakeEvent = {0};
+ ...
+ XPutBackEvent(fgDisplay.Display, (XEvent*));
+
+This can result in reads overflowing the input event when libX11 does:
+
+ XEvent store = *event;
+
+=
+==75304==ERROR: AddressSanitizer: stack-buffer-overflow
