From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 894EC1A072D; Tue, 27 Aug 2024 15:16:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724771761; cv=none; b=PQSDTuH+5ykXS/CHCytAaKe1MhsaiciFMJ6+jVLGqxaNXAN9gasV2P0VrcDO1Nf6PCjr7RB9z2ILa0r5t5k3CQV2hcMEe2yPpMIQ6SmCPvNmwQKLLjd9rH/Kw4wPY3UjZ4G3kmXEw5qjlWH4IcLnq9tl5tYgH4YH7RbFmcMfKxw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724771761; c=relaxed/simple; bh=yz2R0sfoYicqnZuaejeA0o3o0HEGvqNJD1/1wN5wKHU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eQMXd6ay6W4QQWK6VlHvgYE/cBkCodVcexmpwXOWcoO94dYHNY47fj4cYzdHSnUQp0Gr36r7SPR3CVdwka/xBIs3FIw+4clTTDg/2NSANsf3zS/mmfwsNnSOKKwSj4L0HW6sUoQhrxtKLxQFSkPTXIj28IQAjO+oSOwfFdyh1x0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RCR5szIv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RCR5szIv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 007E9C4AF50; Tue, 27 Aug 2024 15:16:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1724771761; bh=yz2R0sfoYicqnZuaejeA0o3o0HEGvqNJD1/1wN5wKHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RCR5szIvZVPSi2OpS7i0nmloH/OY0vELi6mTMkGCCNsp4xguOZ0FnaRobQmCZH+8w 0ykjYYvGUIJZ0194ygckRbq9lDqcg5sfzigxxG2iSZ2jBBmpvfkfVgeb75jCqCi0qm emhEHFSPnLmf6DdmPfA5R8eYyVt5rKYb4MdUdCZU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mikulas Patocka , Khazhismel Kumykov Subject: [PATCH 6.1 013/321] dm resume: dont return EINVAL when signalled Date: Tue, 27 Aug 2024 16:35:21 +0200 Message-ID: <20240827143838.711757799@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827143838.192435816@linuxfoundation.org> References: <20240827143838.192435816@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Khazhismel Kumykov commit 7a636b4f03af9d541205f69e373672e7b2b60a8a upstream. If the dm_resume method is called on a device that is not suspended, the method will suspend the device briefly, before resuming it (so that the table will be swapped). However, there was a bug that the return value of dm_suspended_md was not checked. dm_suspended_md may return an error when it is interrupted by a signal. In this case, do_resume would call dm_swap_table, which would return -EINVAL. This commit fixes the logic, so that error returned by dm_suspend is checked and the resume operation is undone. Signed-off-by: Mikulas Patocka Signed-off-by: Khazhismel Kumykov Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm-ioctl.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1156,8 +1156,26 @@ static int do_resume(struct dm_ioctl *pa suspend_flags &= ~DM_SUSPEND_LOCKFS_FLAG; if (param->flags & DM_NOFLUSH_FLAG) suspend_flags |= DM_SUSPEND_NOFLUSH_FLAG; - if (!dm_suspended_md(md)) - dm_suspend(md, suspend_flags); + if (!dm_suspended_md(md)) { + r = dm_suspend(md, suspend_flags); + if (r) { + down_write(&_hash_lock); + hc = dm_get_mdptr(md); + if (hc && !hc->new_map) { + hc->new_map = new_map; + new_map = NULL; + } else { + r = -ENXIO; + } + up_write(&_hash_lock); + if (new_map) { + dm_sync_table(md); + dm_table_destroy(new_map); + } + dm_put(md); + return r; + } + } old_size = dm_get_size(md); old_map = dm_swap_table(md, new_map);