Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754194AbaAMQSs (ORCPT ); Mon, 13 Jan 2014 11:18:48 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:53663 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754480AbaAMQEu (ORCPT ); Mon, 13 Jan 2014 11:04:50 -0500 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Zhi Yong Wu , "David S. Miller" , Luis Henriques Subject: [PATCH 3.11 169/208] tun: update file current position Date: Mon, 13 Jan 2014 16:00:10 +0000 Message-Id: <1389628849-1614-170-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1389628849-1614-1-git-send-email-luis.henriques@canonical.com> References: <1389628849-1614-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.11 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.11.10.3 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhi Yong Wu commit d0b7da8afa079ffe018ab3e92879b7138977fc8f upstream. Signed-off-by: Zhi Yong Wu Signed-off-by: David S. Miller Signed-off-by: Luis Henriques --- drivers/net/tun.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 171a88f..efc56ca 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1410,6 +1410,8 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv, ret = tun_do_read(tun, tfile, iocb, iv, len, file->f_flags & O_NONBLOCK); ret = min_t(ssize_t, ret, len); + if (ret > 0) + iocb->ki_pos = ret; out: tun_put(tun); 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/