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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 98C37C3A5A3 for ; Tue, 27 Aug 2019 08:04:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61BC4206BA for ; Tue, 27 Aug 2019 08:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566893092; bh=Uf8LcxK1x529NuDSkh7wCF7Hwgb6L9jUZwGpYF8IrnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ptSXI4PaPdcZVPFXSAQNjarofp68ZyxmIkuQzyO6HkevHlqSw7YMKRQkFzbW5WBOr QT7eEISH3TbnYmgLBuCvnpRI3IeiN53vpn67ErRpmusAfRedn+jPkAO1h/LgNnedH/ Uuh+2b3wxFk/Tn0j/wLJ1LkTfViONrSm9GzfoyQo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732647AbfH0IEv (ORCPT ); Tue, 27 Aug 2019 04:04:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:34376 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732628AbfH0IEs (ORCPT ); Tue, 27 Aug 2019 04:04:48 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 5E666206BA; Tue, 27 Aug 2019 08:04:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566893087; bh=Uf8LcxK1x529NuDSkh7wCF7Hwgb6L9jUZwGpYF8IrnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v2XCwy6fCQB3eVZMWsKvtg3O86RFnvrUS7bNg1BUDZKVDfW2aEJapLMdK2OSdwagL UHjYxRvfZRPOaPgE4M1bYXFmZko6nGthazmhjgpcx4g4CAKBuxnmk6ZHPwQwFm2Blt a4xAEJ7zfz+U/rDHylGdfcANaTmJlas/Q+C69ZQs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hector Martin , Jeff Layton , "Yan, Zheng" , Ilya Dryomov Subject: [PATCH 5.2 117/162] ceph: dont try fill file_lock on unsuccessful GETFILELOCK reply Date: Tue, 27 Aug 2019 09:50:45 +0200 Message-Id: <20190827072742.499242103@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827072738.093683223@linuxfoundation.org> References: <20190827072738.093683223@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Jeff Layton commit 28a282616f56990547b9dcd5c6fbd2001344664c upstream. When ceph_mdsc_do_request returns an error, we can't assume that the filelock_reply pointer will be set. Only try to fetch fields out of the r_reply_info when it returns success. Cc: stable@vger.kernel.org Reported-by: Hector Martin Signed-off-by: Jeff Layton Reviewed-by: "Yan, Zheng" Signed-off-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- fs/ceph/locks.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/fs/ceph/locks.c +++ b/fs/ceph/locks.c @@ -111,8 +111,7 @@ static int ceph_lock_message(u8 lock_typ req->r_wait_for_completion = ceph_lock_wait_for_completion; err = ceph_mdsc_do_request(mdsc, inode, req); - - if (operation == CEPH_MDS_OP_GETFILELOCK) { + if (!err && operation == CEPH_MDS_OP_GETFILELOCK) { fl->fl_pid = -le64_to_cpu(req->r_reply_info.filelock_reply->pid); if (CEPH_LOCK_SHARED == req->r_reply_info.filelock_reply->type) fl->fl_type = F_RDLCK;