From patchwork Fri Apr 19 16:40:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 2466411 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 77C1BDF25A for ; Fri, 19 Apr 2013 16:44:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030731Ab3DSQk5 (ORCPT ); Fri, 19 Apr 2013 12:40:57 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:39097 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968419Ab3DSQk4 (ORCPT ); Fri, 19 Apr 2013 12:40:56 -0400 Received: by mail-pd0-f172.google.com with SMTP id 5so2336052pdd.31 for ; Fri, 19 Apr 2013 09:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=rWWpRaVHCH/HnmVjEg3N8oiwouLbhDzdXLd6iAv3zf8=; b=Hb6jonzGuc6xWniI0qu1xB6Zmn1NVb0jqoPhkUa53TViVwmn6YKfnFq9mg6tZ8ceUo 3VqoGnjPZclYZrOBMy+HW/nUR/rTCqdofsYYvQV1gbyUH/tcMyWTWT5elg6U1eH11kAd VPk3dNRMuC29XslY5Q6fj8d/Bg2TMrPtdJDkH5tIpYhl6g1/reP0AhnOYXWKdIgUigUh F0wUjG9ki873gzeO4aiecUMenqqBJNC3pGZ8K65v561rpp8vVYly88f7cCP0e/Q8BWwS NKt5NuzupGC4mhFAqNSSpakBaSihu18IbcFr2fCZ/D79uLBBVQ7AwnCGB/6Jt6F2zlgf sYGw== X-Received: by 10.66.187.5 with SMTP id fo5mr3978734pac.67.1366389655338; Fri, 19 Apr 2013 09:40:55 -0700 (PDT) Received: from linkinjeon-Aspire-One-522.kornet ([121.143.184.70]) by mx.google.com with ESMTPS id ux10sm15337111pab.1.2013.04.19.09.40.52 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Apr 2013 09:40:55 -0700 (PDT) From: Namjae Jeon To: dwmw2@infradead.org, axboe@kernel.dk, shli@kernel.org, Paul.Clements@steeleye.com, npiggin@kernel.dk, neilb@suse.de, cjb@laptop.org, adrian.hunter@intel.com, James.Bottomley@HansenPartnership.com, JBottomley@parallels.com Cc: linux-scsi@vger.kernel.org, linux-mtd@lists.infradead.org, nbd-general@lists.sourceforge.net, linux-raid@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, jcmvbkbc@gmail.com, Namjae Jeon , Namjae Jeon , Vivek Trivedi Subject: [PATCH v2 2/9] mmc: fix max_discard_sectors Date: Sat, 20 Apr 2013 01:40:47 +0900 Message-Id: <1366389647-19382-1-git-send-email-linkinjeon@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Namjae Jeon https://lkml.org/lkml/2013/4/1/292 As per above discussion, there is possibility that request's __data_len field may overflow when max_discard_sectors greater than UINT_MAX >> 9 If multiple discard requests get merged, merged discard request's size exceeds 4GB, there is possibility that merged discard request's __data_len field may overflow. This patch fixes this issue. Reported-by: Max Filippov Signed-off-by: Namjae Jeon Signed-off-by: Vivek Trivedi --- drivers/mmc/card/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 9447a0e..54726b7 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -166,7 +166,7 @@ static void mmc_queue_setup_discard(struct request_queue *q, return; queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q); - q->limits.max_discard_sectors = max_discard; + blk_queue_max_discard_sectors(q, max_discard); if (card->erased_byte == 0 && !mmc_can_discard(card)) q->limits.discard_zeroes_data = 1; q->limits.discard_granularity = card->pref_erase << 9;