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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 C76C4C432C3 for ; Fri, 22 Nov 2019 06:18:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 91FFA2068F for ; Fri, 22 Nov 2019 06:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403483; bh=fjy17N+8wdzjyqHZ76SU5Xme8YPiQP/2h93T/bPWYpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n21JAGzmrRhocggfHoJ6wbgByU7OeJJmlfoFYRpWM0O1Xs9xpb5PaZzAdBvkR7tn8 Kq9ajtlHFr/z3ELDs0cfe8/Q06pPBHeVfmUseHO3aIuql79AWq5TQMzvovNbLt3onS MSZz4yvnfWATWg45TXZMiKFI/apMcoMdVS2i+65k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729300AbfKVGSC (ORCPT ); Fri, 22 Nov 2019 01:18:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:50548 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726767AbfKVGNU (ORCPT ); Fri, 22 Nov 2019 01:13:20 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2E8C520718; Fri, 22 Nov 2019 06:13:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403199; bh=fjy17N+8wdzjyqHZ76SU5Xme8YPiQP/2h93T/bPWYpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XYI19S+IrZMQbWybvyyB8oqMEb0008ZcDnBvOpMb6UQrwnu1TkJGEqajMKOA8dyjt 0u6t2my5lu6bqFBLEbv8CZmf4GCsFe74i9OsWTazQU8JROLyANqEvehs30U5My4HNT HWA9G/QDhiKXnfho0MnUDgbo2aeS3CGhSo6ynbNE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pan Bian , Boris Brezillon , Richard Weinberger , Sasha Levin , linux-mtd@lists.infradead.org Subject: [PATCH AUTOSEL 4.4 16/68] ubi: Do not drop UBI device reference before using Date: Fri, 22 Nov 2019 01:12:09 -0500 Message-Id: <20191122061301.4947-15-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122061301.4947-1-sashal@kernel.org> References: <20191122061301.4947-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pan Bian [ Upstream commit e542087701f09418702673631a908429feb3eae0 ] The UBI device reference is dropped but then the device is used as a parameter of ubi_err. The bug is introduced in changing ubi_err's behavior. The old ubi_err does not require a UBI device as its first parameter, but the new one does. Fixes: 32608703310 ("UBI: Extend UBI layer debug/messaging capabilities") Signed-off-by: Pan Bian Reviewed-by: Boris Brezillon Signed-off-by: Richard Weinberger Signed-off-by: Sasha Levin --- drivers/mtd/ubi/kapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c index e844887732fbd..1db375caef71b 100644 --- a/drivers/mtd/ubi/kapi.c +++ b/drivers/mtd/ubi/kapi.c @@ -227,9 +227,9 @@ struct ubi_volume_desc *ubi_open_volume(int ubi_num, int vol_id, int mode) out_free: kfree(desc); out_put_ubi: - ubi_put_device(ubi); ubi_err(ubi, "cannot open device %d, volume %d, error %d", ubi_num, vol_id, err); + ubi_put_device(ubi); return ERR_PTR(err); } EXPORT_SYMBOL_GPL(ubi_open_volume); -- 2.20.1