From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Sun, 28 Jan 2024 22:58:14 +0000 (+0100)
Subject: git-tiocflush
X-Git-Tag: archive/raspbian/2.31-13+rpi1+deb11u8^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a0861c6c1e73ba1b80fb913759251d5fd612e1ec;p=glibc.git

git-tiocflush

Committed for 2.34

commit 36231bee7ab36d59dd121ea85b91411ae86945f3
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Mon Feb 1 19:39:48 2021 +0100

    hurd TIOCFLUSH: Cope BSD 4.1 semantic

    BSD 4.1 did not have an argument for TIOCFLUSH, BSD 4.2 added it. There
    are still a lot of applications out there that pass a NULL argument to
    TIOCFLUSH, so we should rather cope with it.


Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name git-tiocflush.diff
---

diff --git a/sysdeps/mach/hurd/ioctl.c b/sysdeps/mach/hurd/ioctl.c
index a9a148f1e..5a30a71d3 100644
--- a/sysdeps/mach/hurd/ioctl.c
+++ b/sysdeps/mach/hurd/ioctl.c
@@ -112,6 +112,10 @@ __ioctl (int fd, unsigned long int request, ...)
 	  /* We don't want to advance ARG since it will be used to copy out
 	     too if IOC_OUT is also set.  */
 	  void *argptr = arg;
+	  int zero = 0;
+
+	  if (request == TIOCFLUSH && !argptr)
+	    argptr = &zero;
 
 	  /* Pack an argument into the message buffer.  */
 	  void in (unsigned int count, enum __ioctl_datum type)