From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20141116215329.773397925@1wt.eu> Date: Sun, 16 Nov 2014 22:53:55 +0100 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , "David S. Miller" , Willy Tarreau Subject: [ 27/48] iovec: make sure the caller actually wants anything in In-Reply-To: <28c765bc23bd4bae1611534e510f49f8@local> Sender: linux-kernel-owner@vger.kernel.org List-ID: 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ memcpy_fromiovecend From: Sasha Levin [ Upstream commit 06ebb06d49486676272a3c030bfeef4bd969a8e6 ] Check for cases when the caller requests 0 bytes instead of running off and dereferencing potentially invalid iovecs. Signed-off-by: Sasha Levin Signed-off-by: David S. Miller Signed-off-by: Willy Tarreau --- net/core/iovec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/core/iovec.c b/net/core/iovec.c index 3face24..5ca2fa8 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c @@ -153,6 +153,10 @@ int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len) int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov, int offset, int len) { + /* No data? Done! */ + if (len == 0) + return 0; + /* Skip over the finished iovecs */ while (offset >= iov->iov_len) { offset -= iov->iov_len; -- 1.7.12.2.21.g234cd45.dirty