git: f2ad8d3a1397 - stable/14 - mail: add volatile in grabh()

From: Mark Johnston <>
Date: Fri, 19 Jan 2024 14:25:37 UTC
The branch stable/14 has been updated by markj:


commit f2ad8d3a1397660127f22ba9c0785ef4122a8ba5
Author:     Lexi Winter <lexi@le-Fay.ORG>
AuthorDate: 2024-01-04 22:34:58 +0000
Commit:     Mark Johnston <>
CommitDate: 2024-01-19 14:25:05 +0000

    mail: add volatile in grabh()
    setjmp() requires that any stack variables modified between the setjmp
    call and the longjmp() must be volatile.  This means that 'saveint' in
    grabh() must be volatile, since it's modified after the setjmp().
    Otherwise, the signal handler is not properly restored, resulting in a
    crash (SIGBUS) if ^C is typed twice while composing.
    PR:             276119
    Reported by:    Christopher Davidson <>
    MFC after:      2 weeks
    Pull Request:
    (cherry picked from commit 6c951b37170f1fb2ae8b4827070743e61b6eaed2)
 usr.bin/mail/tty.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index 92cec3c6865c..37797db645c6 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -60,7 +60,7 @@ int
 grabh(struct header *hp, int gflags)
 	struct termios ttybuf;
-	sig_t saveint;
+	volatile sig_t saveint;
 	sig_t savetstp;
 	sig_t savettou;
 	sig_t savettin;