linux-kernel - [PATCH] inotify: set ret in inotify_read() to -EAGAIN only when O

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240901030150.76054-1-ImanDevel@gmail.com>
Date: Sat, 31 Aug 2024 23:01:50 -0400
From: imandevel@...il.com
To: jack@...e.cz
Cc: amir73il@...il.com,
	linux-fsdevel@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Iman Seyed <ImanDevel@...il.com>
Subject: [PATCH] inotify: set ret in inotify_read() to -EAGAIN only when O_NONBLOCK is set

From: Iman Seyed <ImanDevel@...il.com>

Avoid setting ret to -EAGAIN unnecessarily. Only set
it when O_NONBLOCK is specified; otherwise, leave ret
unchanged and proceed to set it to -ERESTARTSYS.

Signed-off-by: Iman Seyed <ImanDevel@...il.com>
---
 fs/notify/inotify/inotify_user.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 4ffc30606e0b..d5d4b306a33d 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -279,9 +279,11 @@ static ssize_t inotify_read(struct file *file, char __user *buf,
 			continue;
 		}
 
-		ret = -EAGAIN;
-		if (file->f_flags & O_NONBLOCK)
+		if (file->f_flags & O_NONBLOCK) {
+			ret = -EAGAIN;
 			break;
+		}
+
 		ret = -ERESTARTSYS;
 		if (signal_pending(current))
 			break;
-- 
2.46.0