X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Finotify_user.c;h=9f2224f65a18b9df2831ce2d71365f0c283c47b9;hb=b407621c35ed5f9a0734e57472e9539117963768;hp=55f6da55b7c0ec36f8e76307c512999570103e4e;hpb=0f7fc9e4d03987fe29f6dd4aa67e4c56eb7ecb05;p=powerpc.git

diff --git a/fs/inotify_user.c b/fs/inotify_user.c
index 55f6da55b7..9f2224f65a 100644
--- a/fs/inotify_user.c
+++ b/fs/inotify_user.c
@@ -455,8 +455,16 @@ static ssize_t inotify_read(struct file *file, char __user *buf,
 			break;
 
 		kevent = inotify_dev_get_event(dev);
-		if (event_size + kevent->event.len > count)
+		if (event_size + kevent->event.len > count) {
+			if (ret == 0 && count > 0) {
+				/*
+				 * could not get a single event because we
+				 * didn't have enough buffer space.
+				 */
+				ret = -EINVAL;
+			}
 			break;
+		}
 
 		if (copy_to_user(buf, &kevent->event, event_size)) {
 			ret = -EFAULT;