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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 81282C282CE for ; Wed, 24 Apr 2019 17:21:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D43F20835 for ; Wed, 24 Apr 2019 17:21:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126465; bh=IubD04QLa48Yf/kJXtC8a+ljo4KCWrMVa/iTQBVBW7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GaRJwJXrYra1qp93VEiLtv8+7HoBXidRXDsra9Iyj9PdFunaT95ydLyiHxhEGpP/l E9/5ygFDM5+/BYbVbuiDb1J1eGN4knDk7UcRnkt/oit7dbzGqLIe1wqyrvR8i7iSt1 hjIXLZqaYczfE3QXMKT+RZNLStZJFl93EZXb0J3k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389275AbfDXRVD (ORCPT ); Wed, 24 Apr 2019 13:21:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:46480 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389263AbfDXRVA (ORCPT ); Wed, 24 Apr 2019 13:21:00 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (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 E288921917; Wed, 24 Apr 2019 17:20:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126460; bh=IubD04QLa48Yf/kJXtC8a+ljo4KCWrMVa/iTQBVBW7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GUpJW8+Vjpu8WFg9al5pwlFrch8Z9zOK4Kmed8VRSMTWBwqIqwPX/WpHmEt9DwjL5 P/WxBpurKQ2ggdtzp5mvsl1Nq4JOjLp3D6pFvACz6LsTxUb/St+ai+e3LMy9+8TkwM ZwN51V6Qym+8t4mYv1JotN4lZzSD/vldloMFUurw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steve French , Amir Goldstein , Sasha Levin Subject: [PATCH 4.4 117/168] fix incorrect error code mapping for OBJECTID_NOT_FOUND Date: Wed, 24 Apr 2019 19:09:21 +0200 Message-Id: <20190424170930.372607167@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170923.452349382@linuxfoundation.org> References: <20190424170923.452349382@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 [ Upstream commit 85f9987b236cf46e06ffdb5c225cf1f3c0acb789 ] It was mapped to EIO which can be confusing when user space queries for an object GUID for an object for which the server file system doesn't support (or hasn't saved one). As Amir Goldstein suggested this is similar to ENOATTR (equivalently ENODATA in Linux errno definitions) so changing NT STATUS code mapping for OBJECTID_NOT_FOUND to ENODATA. Signed-off-by: Steve French CC: Amir Goldstein Signed-off-by: Sasha Levin --- fs/cifs/smb2maperror.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/cifs/smb2maperror.c b/fs/cifs/smb2maperror.c index 98c25b969ab8..7e93d5706bf6 100644 --- a/fs/cifs/smb2maperror.c +++ b/fs/cifs/smb2maperror.c @@ -1034,7 +1034,8 @@ static const struct status_to_posix_error smb2_error_map_table[] = { {STATUS_UNFINISHED_CONTEXT_DELETED, -EIO, "STATUS_UNFINISHED_CONTEXT_DELETED"}, {STATUS_NO_TGT_REPLY, -EIO, "STATUS_NO_TGT_REPLY"}, - {STATUS_OBJECTID_NOT_FOUND, -EIO, "STATUS_OBJECTID_NOT_FOUND"}, + /* Note that ENOATTTR and ENODATA are the same errno */ + {STATUS_OBJECTID_NOT_FOUND, -ENODATA, "STATUS_OBJECTID_NOT_FOUND"}, {STATUS_NO_IP_ADDRESSES, -EIO, "STATUS_NO_IP_ADDRESSES"}, {STATUS_WRONG_CREDENTIAL_HANDLE, -EIO, "STATUS_WRONG_CREDENTIAL_HANDLE"}, -- 2.19.1