| 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: <1389623099-18783-78-git-send-email-luis.henriques@canonical.com> Date: Mon, 13 Jan 2014 14:24:40 +0000 From: Luis Henriques <luis.henriques@...onical.com> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org, kernel-team@...ts.ubuntu.com Cc: Zhi Yong Wu <wuzhy@...ux.vnet.ibm.com>, "David S. Miller" <davem@...emloft.net>, Luis Henriques <luis.henriques@...onical.com> Subject: [PATCH 3.5 77/96] macvtap: update file current position 3.5.7.29 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhi Yong Wu <wuzhy@...ux.vnet.ibm.com> commit e6ebc7f16ca1434a334647aa56399c546be4e64b upstream. Signed-off-by: Zhi Yong Wu <wuzhy@...ux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@...emloft.net> Signed-off-by: Luis Henriques <luis.henriques@...onical.com> --- drivers/net/macvtap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 81fbe78a..b614ab4 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -906,6 +906,8 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv, ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK); ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */ + if (ret > 0) + iocb->ki_pos = ret; out: return ret; } -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists