[PATCH] uniform POLLRDHUP handling between epoll and poll/select (2395140e) · Commits · 戴 / test

As reported by Michael Kerrisk, POLLRDHUP handling was not consistent between epoll and poll/select, since in epoll it was unmaskeable. This patch brings uniformity in POLLRDHUP handling. Signed-off-by:

Davide Libenzi <davidel@xmailserver.org> Cc: Michael Kerrisk <mtk-manpages@gmx.net> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

fs/eventpoll.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -599,7 +599,7 @@ sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event __user *event)
		switch (op) {
		case EPOLL_CTL_ADD:
		if (!epi) {
		epds.events \|= POLLERR \| POLLHUP \| POLLRDHUP;
		epds.events \|= POLLERR \| POLLHUP;

		error = ep_insert(ep, &epds, tfile, fd);
		} else
		@@ -613,7 +613,7 @@ sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event __user *event)
		break;
		case EPOLL_CTL_MOD:
		if (epi) {
		epds.events \|= POLLERR \| POLLHUP \| POLLRDHUP;
		epds.events \|= POLLERR \| POLLHUP;
		error = ep_modify(ep, epi, &epds);
		} else
		error = -ENOENT;

Admin message