Received: by 2002:a05:6520:4d:b0:139:a872:a4c9 with SMTP id i13csp2567605lkm; Mon, 20 Sep 2021 18:55:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNVF/JKVFKHmD9xp73TlTPYb8eG57SrHMfc4DCzC4YGmHLCCZ4hjpS+qXmZnLaox1SoO6U X-Received: by 2002:a6b:2bce:: with SMTP id r197mr21016527ior.212.1632188926145; Mon, 20 Sep 2021 18:48:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632188926; cv=none; d=google.com; s=arc-20160816; b=xXEiRfk+l34eXKXG8+JsB21npheVIEsYElAynx5h1iVuTr7a+UJ6qmp1yWAhE8Hyyl iZvrpNdNvfEc/81g1A26W/bbpS9IjbjjGwwd7U2g8QFPzLlzGGNNgvGRDprJHC1CZrxQ FDqOvB//ALltmG1j/SN9+1t5ZL3Lq99RR2OSMxAPB29cWf+GupOqRDyOblhl4+ZYAIiy 0vO5akGb1aYKHYB1UR5PJzx5yNfty5a3An/jcNzJqh2X0kMOfAqC1c/7ND0jIW9KpfaR FAGD57JwP2aP8k/FSe7G9VGINjaTRscm2tKjNmotMb2+8Y4sIsj5JT3U/+ZkbC9enfTK kZBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FNUuS10ee/UnKwAYFVxTB75boQV01XD+N++YNSldevU=; b=fg+XDxo9TBHX9h2Y7FvIJnXi/gW8kjd45V5JZRAZslnDelLKWUY0gw9W6EwwBWux9j M8a4yLu+XKqbxyoNlcPf52BbjrubyJCOwR3usFmmwroxvlPeb7l1YmsLqXKMgzx2z0p+ FZgEpn1qv7CNxS+toV5XazAXqheeZEKP69ixx2mKoL77koucYrxvhpy+Jtw4zHVHcRTD MS2fT2FEEHXzmneZ76bUB2f4CWSD7QIQ6B6Xa6EUNfHm9VRlg+m16i1RW6j4GZPbwwk9 JsuuXbc0iwNNnjxptPRdlAyD55/8Pcyfca1uC4jKJxNiU21zyrDGzLqqsUqAE5/0FxRP EY4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2ve23RET; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o8si360044ilu.166.2021.09.20.18.48.35; Mon, 20 Sep 2021 18:48:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2ve23RET; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353661AbhITRpj (ORCPT + 99 others); Mon, 20 Sep 2021 13:45:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:48732 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353073AbhITRnm (ORCPT ); Mon, 20 Sep 2021 13:43:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0DDFE61B66; Mon, 20 Sep 2021 17:09:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632157761; bh=OgYCzNSAmHAJIMchHWHi3CWoRBsZ0US8dQMiggFdiMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2ve23RETXPEQemvo5N6nTE5YCMZhcxk1HApQjBXywmQqfZhqxu3Jk4PKWObhrFo5S FYbFaplEPPsi/KqdAB79EyJwWL+f0D2Jleu6Z9h8SG4fDsZqSt7/7d5xPZ20B0NriZ esY01h8zTby20OMxInPcONUHxhED6tslcsNzw99U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Eric Biggers Subject: [PATCH 4.19 107/293] ext4: report correct st_size for encrypted symlinks Date: Mon, 20 Sep 2021 18:41:09 +0200 Message-Id: <20210920163936.927856185@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163933.258815435@linuxfoundation.org> References: <20210920163933.258815435@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Biggers commit 8c4bca10ceafc43b1ca0a9fab5fa27e13cbce99e upstream. The stat() family of syscalls report the wrong size for encrypted symlinks, which has caused breakage in several userspace programs. Fix this by calling fscrypt_symlink_getattr() after ext4_getattr() for encrypted symlinks. This function computes the correct size by reading and decrypting the symlink target (if it's not already cached). For more details, see the commit which added fscrypt_symlink_getattr(). Fixes: f348c252320b ("ext4 crypto: add symlink encryption") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20210702065350.209646-3-ebiggers@kernel.org Signed-off-by: Eric Biggers Signed-off-by: Greg Kroah-Hartman --- fs/ext4/symlink.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) --- a/fs/ext4/symlink.c +++ b/fs/ext4/symlink.c @@ -52,10 +52,19 @@ static const char *ext4_encrypted_get_li return paddr; } +static int ext4_encrypted_symlink_getattr(const struct path *path, + struct kstat *stat, u32 request_mask, + unsigned int query_flags) +{ + ext4_getattr(path, stat, request_mask, query_flags); + + return fscrypt_symlink_getattr(path, stat); +} + const struct inode_operations ext4_encrypted_symlink_inode_operations = { .get_link = ext4_encrypted_get_link, .setattr = ext4_setattr, - .getattr = ext4_getattr, + .getattr = ext4_encrypted_symlink_getattr, .listxattr = ext4_listxattr, };