From patchwork Tue Apr 19 14:54:54 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Newson Edouard <newsondev@gmail.com>
X-Patchwork-Id: 718421
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3JEsvAW012467
	for <patchwork-media@patchwork.kernel.org>;
	Tue, 19 Apr 2011 14:54:57 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752225Ab1DSOyz (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Tue, 19 Apr 2011 10:54:55 -0400
Received: from mail-vx0-f174.google.com ([209.85.220.174]:64347 "EHLO
	mail-vx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751622Ab1DSOyz (ORCPT
	<rfc822;linux-media@vger.kernel.org>);
	Tue, 19 Apr 2011 10:54:55 -0400
Received: by vxi39 with SMTP id 39so4304344vxi.19
	for <linux-media@vger.kernel.org>;
	Tue, 19 Apr 2011 07:54:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:date:message-id:subject:from:to
	:content-type;
	bh=1JIxNvH9qSxCm6/VArtADFomIYadSxR0d8TA+W7jQGI=;
	b=sEKSp83OQeh3QZ5lIHlkWemJFDoIT1tcCWKpBBmhXAvPRkItFMtro8fqZZihHNbXgF
	xZOXUZCkFDKhv2+Uq57gBxSTxnsaSExz0L54QvCNdsx8WMirRWg+DzFlQIVCR0BlYe6a
	EWc1yjjeUJDhzuY3QITTYZZRtLVXOWjV7/bkM=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:date:message-id:subject:from:to:content-type;
	b=b0kDqvr9MP6JIq27pWOPAz16cXsfr4jngV5JFmK4kBaMzG1UB8HbMZHa4J8hYJ8MNS
	cPvQMufyVOCjkTsUPs4dFyDEqt6MK3CYXBMBCXCuS6R97ZCrVudcQF3LV7SirbfcxOiA
	yb2O9Y0TXG+8eR8PMS5NsukP4VO0hZSfEuIgQ=
MIME-Version: 1.0
Received: by 10.220.66.217 with SMTP id o25mr1721863vci.167.1303224894235;
	Tue, 19 Apr 2011 07:54:54 -0700 (PDT)
Received: by 10.220.77.82 with HTTP; Tue, 19 Apr 2011 07:54:54 -0700 (PDT)
Date: Tue, 19 Apr 2011 10:54:54 -0400
Message-ID: <BANLkTikupnA4_muR6zTuhX6VfsidnJ0Q3g@mail.gmail.com>
Subject: [PATCH] videobuf_pages_to_sg: sglist[0] length problem
From: Newson Edouard <newsondev@gmail.com>
To: linux-media@vger.kernel.org
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Tue, 19 Apr 2011 14:54:57 +0000 (UTC)

On function videobuf_pages_to_sg the statement sg_set_page(&sglist[0],
pages[0], PAGE_SIZE -
offset, offset) will failed if if size is less than PAGE_SIZE.

Signed-off-by: Newson Edouard <newsondev@gmail.com
---
 drivers/media/video/videobuf-dma-sg.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

 			goto nopage;

diff --git a/drivers/media/video/videobuf-dma-sg.c
b/drivers/media/video/videobuf-dma-sg.c
index ddb8f4b..f300dea 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -108,8 +108,9 @@ static struct scatterlist
*videobuf_pages_to_sg(struct page **pages,
 	if (PageHighMem(pages[0]))
 		/* DMA to highmem pages might not work */
 		goto highmem;
-	sg_set_page(&sglist[0], pages[0], PAGE_SIZE - offset, offset);
-	size -= PAGE_SIZE - offset;
+	sg_set_page(&sglist[0], pages[0],
+			min_t(size_t, PAGE_SIZE - offset, size), offset);
+	size -= min_t(size_t, PAGE_SIZE - offset, size);
 	for (i = 1; i < nr_pages; i++) {
 		if (NULL == pages[i])