From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2591571-1524405567-2-5509891308268151860 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1524405567; b=bIgSiCKr4OoZrhVZ6Yl9YP65lkL/DnsjyKHhNPip8F5eRpAxKg heN8p9N4EwzOS4Xe3+QDgs3dqaI6xMB2VDQSY5YljjsedsM75d0Z72drc4R0xbV8 kDgF9Lw6O3eVMc2wHows6YCvjWiKaUpBPngGh0++zLT7wV3aoOZBA5y6LM/ERl3c reu0OTRQv5NEpOhtr3lMig26Bf+Fazrfz6hGhE9esDcFXu8yjhPj31G+CauS+LYv BD+SP9LiJy/L0LSftPBv2jfXJoNSJYBcUDe3rFtoxR5EADywp0S6tTQ1FkewqmAS gqwfaZKwVhgSCQdOXb6i0ThXzXJRrty4B1gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1524405567; bh=Q0jCdDJYGiM+mN8kylYOVjEBKL1FZf hSiN4oWGCy87o=; b=P9kZHAgVovjW1Ov7lJNwaTvUtlqnWcqy7Kg7ALqMR5BMzx 5QM1R1CVVzgw20XeJ0UEgBZfgUk0+fX1eWbWdxA6/LqsLpL5Ew8NBweXXouyPDLs /Wc6whVWO3vpsEmGTbXefS+h0U7pe/9upqGvM3o0/HE1q6RM3Nn3FH3T4Ffeuqx4 D/EBJkOUjjTFrOTtI1WWRyWASuuttQbaygRq/8hn36PGZXGASqJ7bQtpZeJK7HFx hJNMS2WFds1t/mrKrH85T4hJE4s8sYvzVky0IdIYIRr74hWv2NFu5cD5y2dRhk/q la/ddOFNyllGLHQ9aLlZV1hAY5ORwtcX5rowtveA== ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfOlGha/TzCzq2pPVKUyLECZ+DXcgT/H8ekCW6XBjfT68v1sAKP0lM3EL/rdjDh9NBaYEghimHwLJRKNSQRphCUfu+hAvUf91QO17Q1RkvWVXbSiCglwc NBQSpFUM9H6rha0HifCgHLV7U+4OU/SznJItUPyxGtHgtKmGU5CGCFvwNneERLDyb3vcjysInSYDBfOEWtvbkVAn8u4ANal9nlVd0XG9oM/k7An2pmE4WdrG X-CM-Analysis: v=2.3 cv=FKU1Odgs c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=VwQbUJbxAAAA:8 a=ag1SF4gXAAAA:8 a=HsDDrbOFvXNNo7OG3RkA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754321AbeDVN7V (ORCPT ); Sun, 22 Apr 2018 09:59:21 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:46812 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753979AbeDVN7T (ORCPT ); Sun, 22 Apr 2018 09:59:19 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Theodore Tso Subject: [PATCH 4.16 084/196] jbd2: if the journal is aborted then dont allow update of the log tail Date: Sun, 22 Apr 2018 15:51:44 +0200 Message-Id: <20180422135108.643842521@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422135104.278511750@linuxfoundation.org> References: <20180422135104.278511750@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Theodore Ts'o commit 85e0c4e89c1b864e763c4e3bb15d0b6d501ad5d9 upstream. This updates the jbd2 superblock unnecessarily, and on an abort we shouldn't truncate the log. Signed-off-by: Theodore Ts'o Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- fs/jbd2/journal.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -974,7 +974,7 @@ out: } /* - * This is a variaon of __jbd2_update_log_tail which checks for validity of + * This is a variation of __jbd2_update_log_tail which checks for validity of * provided log tail and locks j_checkpoint_mutex. So it is safe against races * with other threads updating log tail. */ @@ -1417,6 +1417,9 @@ int jbd2_journal_update_sb_log_tail(jour journal_superblock_t *sb = journal->j_superblock; int ret; + if (is_journal_aborted(journal)) + return -EIO; + BUG_ON(!mutex_is_locked(&journal->j_checkpoint_mutex)); jbd_debug(1, "JBD2: updating superblock (start %lu, seq %u)\n", tail_block, tail_tid);