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=-10.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 CB4ECC43387 for ; Fri, 11 Jan 2019 14:29:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8E0A12063F for ; Fri, 11 Jan 2019 14:29:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216956; bh=zipRhKOJR5LLiOcymnUGGu52rzlnPDzF4hbHZw+6asU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PacVRW/kql/Ht9W6bf7u41Zvv9D+cnie/H+mqInFKXhlPQ3DHj3FKWJeFX7Ai71fd RHCkbX3c2Ea5g0JumXBTvwb8CEak5R9UmgwKlJl1Q6C9wRlOgxHruJUOS+0h5Dp1Kt c6pXdFa2l6UPzY1GS5ukVzbZw44R9pRPu+cJVdIg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388687AbfAKO3Q (ORCPT ); Fri, 11 Jan 2019 09:29:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:48136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388246AbfAKO3N (ORCPT ); Fri, 11 Jan 2019 09:29:13 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 76D982063F; Fri, 11 Jan 2019 14:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216952; bh=zipRhKOJR5LLiOcymnUGGu52rzlnPDzF4hbHZw+6asU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fv4/fVgQcCUBBDBw8ILPw+8ROjJ4XUwOuz24PRLajpriHXwKh0JW8FF4p6gc6K5NX wk3TD6mpNubsKbjWAZ61L/5eQSZDmewIGYoJvvruNjAxdcae+ACBGVu971PYNUdwzF bLGu5Pw0GP0mjyGNrS7wsuLTIcB/qPRxScsKGDRU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasily Averin , David Teigland , stable@kernel.org Subject: [PATCH 4.9 50/63] dlm: lost put_lkb on error path in receive_convert() and receive_unlock() Date: Fri, 11 Jan 2019 15:14:53 +0100 Message-Id: <20190111131053.647900160@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131046.387528003@linuxfoundation.org> References: <20190111131046.387528003@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vasily Averin commit c0174726c3976e67da8649ac62cae43220ae173a upstream. Fixes 6d40c4a708e0 ("dlm: improve error and debug messages") Cc: stable@kernel.org # 3.5 Signed-off-by: Vasily Averin Signed-off-by: David Teigland Signed-off-by: Greg Kroah-Hartman --- fs/dlm/lock.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -4178,6 +4178,7 @@ static int receive_convert(struct dlm_ls (unsigned long long)lkb->lkb_recover_seq, ms->m_header.h_nodeid, ms->m_lkid); error = -ENOENT; + dlm_put_lkb(lkb); goto fail; } @@ -4231,6 +4232,7 @@ static int receive_unlock(struct dlm_ls lkb->lkb_id, lkb->lkb_remid, ms->m_header.h_nodeid, ms->m_lkid); error = -ENOENT; + dlm_put_lkb(lkb); goto fail; }