From patchwork Fri Aug 18 19:27:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 9909823 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0AFBE6038C for ; Fri, 18 Aug 2017 19:28:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F01A528D3F for ; Fri, 18 Aug 2017 19:28:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E51F428D50; Fri, 18 Aug 2017 19:28:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5570828D47 for ; Fri, 18 Aug 2017 19:28:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751173AbdHRT1q (ORCPT ); Fri, 18 Aug 2017 15:27:46 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:34846 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750993AbdHRT1q (ORCPT ); Fri, 18 Aug 2017 15:27:46 -0400 Received: by mail-pg0-f43.google.com with SMTP id v189so69865143pgd.2 for ; Fri, 18 Aug 2017 12:27:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=5hvu05o0oSB0NNVUUmMn6wZpSE37EqXfJeHnNmtutWs=; b=VkUWqNTJqNsPhB/cA2YuJPcGV3uv72mtoodf97DDqzJ+FOzU2+QYvknEBHmt7Eyrdt j0tZLQMB08lzGeUDxOP7ZwrCAuFPIExwQnbUYnDezj0u5m2RDNsqmqKJmeJ7c0BrCngR TkGmTguAAUlHPEoAun+VDW8/7CZnfSWazMnimBCg7AM7iu9CqqDU/zzpdi38EYaeDqoM d0fPtQ0VvZA5OiMZacFXI0206fLYj1LAZBoeGoncSrPkY/dtitSDSX7BueOyfWc14Lew x+7bArUNk3B7av5LU+2Tu3OyzQCTp+hA095dzlOqcWJVGUqnjp4ryWp+a2HzwkSsJ7Nu Id1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=5hvu05o0oSB0NNVUUmMn6wZpSE37EqXfJeHnNmtutWs=; b=d+kTCq+x6stUhCcNTFh+LeiyVRHanuIUO+7E17qd2ybH36n5CEk/ap2Cqqhs2OsqUI SupyR/dzCdpqHXxPPea5ad57F5qkbN5PT5iB/r6hG1yqhfIkPp0Ahj21rYfVG8TRxSV5 M+5ACzbug81t1QN59cC1tgxRGkFzKgEr6qJA9zqCwH3fjiYc1zVjZa9CWCkp8pH5/b0p hBwpYwbNlzouYEiBM6tVVcx7dVeu1eoA7PBkh0qbnnu0y9zlG9h6hFuZSuY0AVlqWQpf 0H2b0CaEo1l8RohdPegbiY8h75tqgoPKgEsavGjS70AoIK3anln/Adyw7kr5hoKX4DBc 5J/w== X-Gm-Message-State: AHYfb5jrh4B1dG1q2X7p2MVYEncaTP4gsLcpqnUuYjz27frGp8ibVxiR z9gWyi7Srn6abf/s7QfFAA== X-Received: by 10.98.133.81 with SMTP id u78mr6689103pfd.189.1503084465428; Fri, 18 Aug 2017 12:27:45 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::7:7002]) by smtp.gmail.com with ESMTPSA id d3sm9972633pgf.75.2017.08.18.12.27.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Aug 2017 12:27:44 -0700 (PDT) From: Omar Sandoval To: linux-block@vger.kernel.org Cc: kernel-team@fb.com, Hannes Reinecke , Ming Lei , Karel Zak Subject: [PATCH v2 1/3] loop: fix hang if LOOP_SET_STATUS gets invalid blocksize or encrypt type Date: Fri, 18 Aug 2017 12:27:35 -0700 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval In both of these error cases, we need to make sure to unfreeze the queue before we return. Fixes: ecdd09597a57 ("block/loop: fix race between I/O and set_status") Fixes: f2c6df7dbf9a ("loop: support 4k physical blocksize") Reviewed-by: Hannes Reinecke Signed-off-by: Omar Sandoval --- drivers/block/loop.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index ef8334949b42..26548e07bc31 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1125,11 +1125,15 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info) if (info->lo_encrypt_type) { unsigned int type = info->lo_encrypt_type; - if (type >= MAX_LO_CRYPT) - return -EINVAL; + if (type >= MAX_LO_CRYPT) { + err = -EINVAL; + goto exit; + } xfer = xfer_funcs[type]; - if (xfer == NULL) - return -EINVAL; + if (xfer == NULL) { + err = -EINVAL; + goto exit; + } } else xfer = NULL; @@ -1144,10 +1148,14 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info) if (LO_INFO_BLOCKSIZE(info) != 512 && LO_INFO_BLOCKSIZE(info) != 1024 && LO_INFO_BLOCKSIZE(info) != 2048 && - LO_INFO_BLOCKSIZE(info) != 4096) - return -EINVAL; - if (LO_INFO_BLOCKSIZE(info) > lo->lo_blocksize) - return -EINVAL; + LO_INFO_BLOCKSIZE(info) != 4096) { + err = -EINVAL; + goto exit; + } + if (LO_INFO_BLOCKSIZE(info) > lo->lo_blocksize) { + err = -EINVAL; + goto exit; + } } if (lo->lo_offset != info->lo_offset ||