From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41B1AC433DF for ; Fri, 19 Jun 2020 13:33:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2060520771 for ; Fri, 19 Jun 2020 13:33:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592573626; bh=uWNJjXeHbXBQYoRyE781aBfDflR9JlZ7PHMxRAFJ1pY=; h=Subject:To:Cc:From:Date:List-ID:From; b=lOJeAvZZy5371cCAvxc93wenAXSaw+yieMbRF3CEcNn1OzvInVdG32vr6TFRU4XEu FtdPmWJHC6jkhIl40NRDy8Qv1t7qlI1r2shIj4zr2AgUEvuC4w8gkUZA/3CUWfEuit RnaR8HWni/AkPhdswvzwjw2NzE+XzM2V6nxg84+A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729134AbgFSNdp (ORCPT ); Fri, 19 Jun 2020 09:33:45 -0400 Received: from forward5-smtp.messagingengine.com ([66.111.4.239]:34565 "EHLO forward5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732786AbgFSNdn (ORCPT ); Fri, 19 Jun 2020 09:33:43 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.nyi.internal (Postfix) with ESMTP id 421D31945588; Fri, 19 Jun 2020 09:33:43 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 19 Jun 2020 09:33:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=WFIDQo /gENAXuMeJ5KJT6S7GWe5RQRp2RcL4g0yGyKY=; b=JPf3V/n1dfxCcK3sF8D9+f Cjez+JcOj03g6nC+E79wn9OBoqHcnk8ejPWkftGMkFzzljNGDDz2VlncdJmX07Co uBbsZHWUEt1Vj5GCu5XQSThDqijGukB2nK0QI0yGEuyzhWX4LGdN/9LpGmLX5n9S QjhrC3z5y9vRd0lbwRzALmz9sTx/D4jXW5Rk9/ggvDR+Zid//tcW0SVWQHVD87ZR +R7riSvlczJz/mh1C45Ha2cHNXiuFlVUp1Bzr1n2zUfsvTkCqlkp25uUwGjwZWhP 4yLfJj5j7FzOjkRSVaIOs8Xg5CxG/eTKkM2tibDJOfgYfltqlSwkuMb9TzzGidLw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudejiedgieejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepieetveehuedvhfdtgfdvieeiheehfeelveevheejud etveeuveeludejjefgteehnecukfhppeekfedrkeeirdekledruddtjeenucevlhhushht vghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id C5CFB3280069; Fri, 19 Jun 2020 09:33:42 -0400 (EDT) Subject: FAILED: patch "[PATCH] dm crypt: avoid truncating the logical block size" failed to apply to 4.9-stable tree To: ebiggers@google.com, mpatocka@redhat.com, snitzer@redhat.com Cc: From: Date: Fri, 19 Jun 2020 15:33:32 +0200 Message-ID: <1592573612126194@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 64611a15ca9da91ff532982429c44686f4593b5f Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 4 Jun 2020 12:01:26 -0700 Subject: [PATCH] dm crypt: avoid truncating the logical block size queue_limits::logical_block_size got changed from unsigned short to unsigned int, but it was forgotten to update crypt_io_hints() to use the new type. Fix it. Fixes: ad6bf88a6c19 ("block: fix an integer overflow in logical block size") Cc: stable@vger.kernel.org Signed-off-by: Eric Biggers Reviewed-by: Mikulas Patocka Signed-off-by: Mike Snitzer diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 71c651465bdd..000ddfab5ba0 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -3312,7 +3312,7 @@ static void crypt_io_hints(struct dm_target *ti, struct queue_limits *limits) limits->max_segment_size = PAGE_SIZE; limits->logical_block_size = - max_t(unsigned short, limits->logical_block_size, cc->sector_size); + max_t(unsigned, limits->logical_block_size, cc->sector_size); limits->physical_block_size = max_t(unsigned, limits->physical_block_size, cc->sector_size); limits->io_min = max_t(unsigned, limits->io_min, cc->sector_size);