From patchwork Sat Apr 13 13:38:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 2440691 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 9714EDFB78 for ; Sat, 13 Apr 2013 13:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753496Ab3DMNim (ORCPT ); Sat, 13 Apr 2013 09:38:42 -0400 Received: from mail-da0-f44.google.com ([209.85.210.44]:38373 "EHLO mail-da0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753776Ab3DMNij (ORCPT ); Sat, 13 Apr 2013 09:38:39 -0400 Received: by mail-da0-f44.google.com with SMTP id z20so1502818dae.3 for ; Sat, 13 Apr 2013 06:38:39 -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=Fc+QgofSrJrWKJ8JMBUoVZBrwy+VwLKWhEUSK0V2VmY=; b=h+Mj+vGwrvIb+S1ftKhN++vWop+eZwQkh95LlDXdv2x8BkG3NQjLF7nxlQKrAM6por 71rP8yzJL33iXIqYWjV8+wcwaK3FuMlyJdDsZYfk+BV+sZNJlWR9P2Sa1LAyiQcpVPLA /1tzqbT8m1/h9V/qtDn8DsV7eIrzg/94sk3zm54K9/iE8iqxGFyoGZ2yLuxm/BOPm7ka aketsRBl8c20rfz53e4LRXK9pUbMiqvuzqVMI+PHsyAL/OfiuraPUy/unRZOCfaL4g4i zFvlBYEF3w8fpI05F4c72dvBSGrzyPuIHLpRtr5Xp/w2/rjAuFgVW8y8jOmFWN/NR0j5 jdLA== X-Received: by 10.68.105.5 with SMTP id gi5mr19439845pbb.180.1365860319226; Sat, 13 Apr 2013 06:38:39 -0700 (PDT) Received: from linkinjeon-Aspire-One-522.kornet ([121.143.184.70]) by mx.google.com with ESMTPS id qh4sm13898236pac.8.2013.04.13.06.38.35 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 13 Apr 2013 06:38:38 -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 Cc: 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, Namjae Jeon , Namjae Jeon , Vivek Trivedi Subject: [PATCH 2/8] mmc: fix max_discard_sectors Date: Sat, 13 Apr 2013 22:38:29 +0900 Message-Id: <1365860309-21261-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 Tested-by: Max Filippov --- drivers/mmc/card/queue.c | 2 +- drivers/mmc/core/core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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; diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 7b435a3..6ee530c 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2058,7 +2058,7 @@ static unsigned int mmc_do_calc_max_discard(struct mmc_card *card, if (card->erase_shift) max_qty = UINT_MAX >> card->erase_shift; else if (mmc_card_sd(card)) - max_qty = UINT_MAX; + max_qty = UINT_MAX >> 9; else max_qty = UINT_MAX / card->erase_size; @@ -2100,7 +2100,7 @@ unsigned int mmc_calc_max_discard(struct mmc_card *card) unsigned int max_discard, max_trim; if (!host->max_discard_to) - return UINT_MAX; + return UINT_MAX >> 9; /* * Without erase_group_def set, MMC erase timeout depends on clock