Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753983AbdGYTY6 (ORCPT ); Tue, 25 Jul 2017 15:24:58 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36386 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753875AbdGYTYy (ORCPT ); Tue, 25 Jul 2017 15:24:54 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Richard Weinberger Subject: [PATCH 4.12 131/196] ubifs: Set double hash cookie also for RENAME_EXCHANGE Date: Tue, 25 Jul 2017 12:22:10 -0700 Message-Id: <20170725192052.617814370@linuxfoundation.org> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170725192046.422343510@linuxfoundation.org> References: <20170725192046.422343510@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1245 Lines: 38 4.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Richard Weinberger commit a6664433d383eeb71cbdeb9aea2c66eeea76e742 upstream. We developed RENAME_EXCHANGE and UBIFS_FLG_DOUBLE_HASH more or less in parallel and this case was forgotten. :-( Fixes: d63d61c16972 ("ubifs: Implement UBIFS_FLG_DOUBLE_HASH") Signed-off-by: Richard Weinberger Signed-off-by: Greg Kroah-Hartman --- fs/ubifs/journal.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -984,6 +984,7 @@ int ubifs_jnl_xrename(struct ubifs_info dent1->nlen = cpu_to_le16(fname_len(snd_nm)); memcpy(dent1->name, fname_name(snd_nm), fname_len(snd_nm)); dent1->name[fname_len(snd_nm)] = '\0'; + set_dent_cookie(c, dent1); zero_dent_node_unused(dent1); ubifs_prep_grp_node(c, dent1, dlen1, 0); @@ -996,6 +997,7 @@ int ubifs_jnl_xrename(struct ubifs_info dent2->nlen = cpu_to_le16(fname_len(fst_nm)); memcpy(dent2->name, fname_name(fst_nm), fname_len(fst_nm)); dent2->name[fname_len(fst_nm)] = '\0'; + set_dent_cookie(c, dent2); zero_dent_node_unused(dent2); ubifs_prep_grp_node(c, dent2, dlen2, 0);