SecBSD/src
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with OpenBSD -current

Browse Source
This commit is contained in:
purplerain 2023-12-02 11:08:21 +00:00
parent 8873eac723
commit 02d83d01a6
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
275 changed files with 1129 additions and 1124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/skel/dot.version
View File

@ -1 +1 @@
# SecBSD 1.4-8cd59e6: Fri Nov 24 03:25:50 UTC 2023 (Mictlantecuhtli)
# SecBSD 1.4-a5839ef: Fri Dec 1 14:35:24 UTC 2023 (Mictlantecuhtli)

1
lib/libkeynote/base64.c
View File

@ -1,5 +1,4 @@
/* $OpenBSD: base64.c,v 1.12 2023/04/13 18:20:21 tb Exp $ */
/* $OpenBSD: base64.c,v 1.12 2023/04/13 18:20:21 tb Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
*

14
sys/dev/pv/virtio.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: virtio.c,v 1.23 2023/07/07 10:23:39 patrick Exp $ */
/* $OpenBSD: virtio.c,v 1.24 2023/12/02 10:01:35 sf Exp $ */
/* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */
/*
@ -97,7 +97,7 @@ virtio_log_features(uint64_t host, uint64_t neg,
const struct virtio_feature_name *namep;
int i;
char c;
uint32_t bit;
uint64_t bit;
for (i = 0; i < 64; i++) {
if (i == 30) {
@ -107,13 +107,17 @@ virtio_log_features(uint64_t host, uint64_t neg,
*/
continue;
}
bit = 1 << i;
bit = 1ULL << i;
if ((host&bit) == 0)
continue;
namep = (i < 24 || i > 37) ? guest_feature_names :
transport_feature_names;
namep = guest_feature_names;
while (namep->bit && namep->bit != bit)
namep++;
if (namep->name == NULL) {
namep = transport_feature_names;
while (namep->bit && namep->bit != bit)
namep++;
}
c = (neg&bit) ? '+' : '-';
if (namep->name)
printf(" %c%s", c, namep->name);

6
sys/dev/pv/virtiovar.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: virtiovar.h,v 1.15 2023/07/07 10:23:39 patrick Exp $ */
/* $OpenBSD: virtiovar.h,v 1.16 2023/12/02 10:01:35 sf Exp $ */
/* $NetBSD: virtiovar.h,v 1.1 2011/10/30 12:12:21 hannken Exp $ */
/*
@ -138,7 +138,7 @@ struct virtqueue {
};
struct virtio_feature_name {
uint32_t bit;
uint64_t bit;
const char *name;
};
@ -203,7 +203,7 @@ struct virtio_softc {
#define virtio_device_reset(sc) virtio_set_status((sc), 0)
static inline int
virtio_has_feature(struct virtio_softc *sc, unsigned int fbit)
virtio_has_feature(struct virtio_softc *sc, uint64_t fbit)
{
if (sc->sc_active_features & fbit)
return 1;

10
sys/net/pipex.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: pipex.c,v 1.150 2023/11/28 13:23:20 bluhm Exp $ */
/* $OpenBSD: pipex.c,v 1.151 2023/12/01 20:30:22 mvs Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@ -716,7 +716,8 @@ pipex_lookup_by_session_id(int protocol, int session_id)
void
pipex_timer_start(void)
{
timeout_set_proc(&pipex_timer_ch, pipex_timer, NULL);
timeout_set_flags(&pipex_timer_ch, pipex_timer, NULL,
KCLOCK_NONE, TIMEOUT_PROC | TIMEOUT_MPSAFE);
timeout_add_sec(&pipex_timer_ch, pipex_prune);
}
@ -731,8 +732,6 @@ pipex_timer(void *ignored_arg)
{
struct pipex_session *session, *session_tmp;
timeout_add_sec(&pipex_timer_ch, pipex_prune);
mtx_enter(&pipex_list_mtx);
/* walk through */
LIST_FOREACH_SAFE(session, &pipex_session_list, session_list,
@ -767,6 +766,9 @@ pipex_timer(void *ignored_arg)
}
}
if (LIST_FIRST(&pipex_session_list))
timeout_add_sec(&pipex_timer_ch, pipex_prune);
mtx_leave(&pipex_list_mtx);
}