From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761649AbZEFWEt (ORCPT ); Wed, 6 May 2009 18:04:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759831AbZEFVyn (ORCPT ); Wed, 6 May 2009 17:54:43 -0400 Received: from kroah.org ([198.145.64.141]:57133 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761396AbZEFVyk (ORCPT ); Wed, 6 May 2009 17:54:40 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Wed May 6 14:47:58 2009 Message-Id: <20090506214758.773043321@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Wed, 06 May 2009 14:45:53 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, FUJITA Tomonori , Jens Axboe Subject: [patch 25/58] bio: fix memcpy corruption in bio_copy_user_iov() References: <20090506214528.660389067@mini.kroah.org> Content-Disposition: inline; filename=bio-fix-memcpy-corruption-in-bio_copy_user_iov.patch In-Reply-To: <20090506215017.GA21981@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.29-stable review patch. If anyone has any objections, please let us know. ------------------ From: FUJITA Tomonori commit 69838727bcd819a8fd73a88447801221788b0c6d upstream. st driver uses blk_rq_map_user() in order to just build a request out of page frames. In this case, map_data->offset is a non zero value and iov[0].iov_base is NULL. We need to increase nr_pages for that. Cc: stable@kernel.org Signed-off-by: FUJITA Tomonori Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- fs/bio.c | 3 +++ 1 file changed, 3 insertions(+) --- a/fs/bio.c +++ b/fs/bio.c @@ -806,6 +806,9 @@ struct bio *bio_copy_user_iov(struct req len += iov[i].iov_len; } + if (offset) + nr_pages++; + bmd = bio_alloc_map_data(nr_pages, iov_count, gfp_mask); if (!bmd) return ERR_PTR(-ENOMEM);