| 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
| ||
|
Message-Id: <1357378446-19656-4-git-send-email-jasowang@redhat.com> Date: Sat, 5 Jan 2013 17:34:06 +0800 From: Jason Wang <jasowang@...hat.com> To: davem@...emloft.net, mst@...hat.com, netdev@...r.kernel.org, linux-kernel@...r.kernel.org Cc: Jason Wang <jasowang@...hat.com> Subject: [PATCH V2 3/3] tuntap: don't add to waitqueue when POLLERR Currently, tun_chr_poll() returns POLLERR after waitqueue adding during device unregistration. This would confuse some of its user such as vhost which assume when POLLERR is returned, it wasn't added to the waitqueue. Fix this by returning POLLERR before adding to waitqueue. Signed-off-by: Jason Wang <jasowang@...hat.com> --- drivers/net/tun.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index fbd106e..f9c0049 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -886,7 +886,7 @@ static unsigned int tun_chr_poll(struct file *file, poll_table *wait) struct sock *sk; unsigned int mask = 0; - if (!tun) + if (!tun || tun->dev->reg_state != NETREG_REGISTERED) return POLLERR; sk = tfile->socket.sk; @@ -903,9 +903,6 @@ static unsigned int tun_chr_poll(struct file *file, poll_table *wait) sock_writeable(sk))) mask |= POLLOUT | POLLWRNORM; - if (tun->dev->reg_state != NETREG_REGISTERED) - mask = POLLERR; - tun_put(tun); return mask; } -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists