From c9b5e05e3c1f3abe716a3b92db4fc42f2546bea8 Mon Sep 17 00:00:00 2001
From: rsadowski <rsadowski@openbsd.org>
Date: Sun, 14 Jun 2026 08:52:16 +0000
Subject: [PATCH] Check error in proc_forward_imsg

---
 usr.sbin/relayd/proc.c   | 8 +++-----
 usr.sbin/relayd/relayd.h | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/usr.sbin/relayd/proc.c b/usr.sbin/relayd/proc.c
index c463ebf408f..c18398fc7be 100644
--- a/usr.sbin/relayd/proc.c
+++ b/usr.sbin/relayd/proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.54 2026/06/14 08:37:00 rsadowski Exp $	*/
+/*	$OpenBSD: proc.c,v 1.55 2026/06/14 08:52:16 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -793,7 +793,7 @@ proc_composev(struct privsep *ps, enum privsep_procid id,
 	return (proc_composev_imsg(ps, id, -1, type, -1, -1, iov, iovcnt));
 }
 
-int
+void
 proc_forward_imsg(struct privsep *ps, struct imsg *imsg,
     enum privsep_procid id)
 {
@@ -802,11 +802,9 @@ proc_forward_imsg(struct privsep *ps, struct imsg *imsg,
 	proc_range(ps, id, &n, &m);
 	for (; n < m; n++) {
 		if (imsg_forward(&ps->ps_ievs[id][n].ibuf, imsg) == -1)
-			return (-1);
+			fatal("%s: imsg_forward", __func__);
 		imsg_event_add(&ps->ps_ievs[id][n]);
 	}
-
-	return (0);
 }
 
 struct imsgbuf *
diff --git a/usr.sbin/relayd/relayd.h b/usr.sbin/relayd/relayd.h
index f3c33938c0b..0e4d5bc2901 100644
--- a/usr.sbin/relayd/relayd.h
+++ b/usr.sbin/relayd/relayd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.h,v 1.283 2026/06/14 08:51:11 rsadowski Exp $	*/
+/*	$OpenBSD: relayd.h,v 1.284 2026/06/14 08:52:16 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -1416,7 +1416,7 @@ int	 proc_composev_imsg(struct privsep *, enum privsep_procid, int,
 	    u_int16_t, u_int32_t, int, const struct iovec *, int);
 int	 proc_composev(struct privsep *, enum privsep_procid,
 	    uint16_t, const struct iovec *, int);
-int	 proc_forward_imsg(struct privsep *, struct imsg *,
+void	proc_forward_imsg(struct privsep *, struct imsg *,
 	    enum privsep_procid);
 struct imsgbuf *
 	 proc_ibuf(struct privsep *, enum privsep_procid, int);