Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1303100pxv; Thu, 1 Jul 2021 23:55:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyu6A0ggdZKXaxk+PCrAb/z83KE6Xv/IFibNBpPPjsSw3dUQ8hAhKzBhohjiiUj+BavHXq2 X-Received: by 2002:a17:906:3ed4:: with SMTP id d20mr3932254ejj.515.1625208956994; Thu, 01 Jul 2021 23:55:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625208956; cv=none; d=google.com; s=arc-20160816; b=NLHcuB6HKMPdGdFRS9j5PjozKo+v5571/ckjndpPucoecIl0UNqGIcQFv/bxrErehJ ss/v89SIjlL6WIQDvhqrtWNaLWrw4nEiP99LuOET59m2PhTAktjafj8mLTsMFOAuYyPz QKOM3Z4u+grX/GUiOE9FNTUP3kl5kd9euwPYGevXSe6bPAvdrmT5XUr+SDiT+wZzVZWX yz2qZpcXoFem2U8wyHoYdFk0ho8r71idO25ZUEZSNmlCSRrMNlf8aBfiLb5qgzkf/ih0 u5HJQ7YoKHrPJTDWM98ZbpMzmti78x2Nwh8T7fVC4OsNN1GXHzfHutUmZ1PJrAYbc/vH T/NQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=O3NGSCkh0hnQlaNEpxOcMwB9yIc4wz9Bkksdr179CJg=; b=V+APDQenNjhYENJP6/IVV8kb02gfC7sKH2UOeZREMSjZYriN//xsPKM/orzr2DbptQ StGCdZDeKLVgP5HjLdQUB+Kkst8HD6K/WzvcExaFDd+veGU+MMO8qraOCVS2VyYy4G6i /dxJ1F88ZmLQHuHOoJilzpABk0itVnS5xtcENALgfYgnG6qKS4IZESHCJh+3SRHvYbHF 7BnZWq6gvsRrNz1pmgIYqz59z0liOLwdmPvORzfxkO+RYTBYw6d5tnX9UMjARqPNP+Za iJvKub7LjCsoi4wrBBrrPQJfrRxZowYccfHE6vBKzi8SSqLbN4kVrg0rIhu2irzQPl9k D11A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fBRQEhrJ; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x19si2187215ejb.628.2021.07.01.23.55.32; Thu, 01 Jul 2021 23:55:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-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=@kernel.org header.s=k20201202 header.b=fBRQEhrJ; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230114AbhGBG5Z (ORCPT + 99 others); Fri, 2 Jul 2021 02:57:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:42490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229542AbhGBG5X (ORCPT ); Fri, 2 Jul 2021 02:57:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 659D461413; Fri, 2 Jul 2021 06:54:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625208891; bh=oytk1FqAK/cRWx3e72Lrjf5gkgDm1h+IK3FE/F4jrDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fBRQEhrJJ96bGUI9d8xd7QPa3WJ5ACNQiNFFlLiciyLDX/+kJJiMK4kdY7t2a/Hu8 L/JOKII31seusjSyqQH0p0zJVYGN3K/WIcgd4EvZ76bvtCnhC2R1Qi/gBZ1nIw4M5l /qtnEb4tJYlMpY81DoSUpGC6zCG/nQqQ/+GfV7vfTFAIkkyWTE3QNeeLSLVuC6wUlG ZFUirevxfCcRDTK+uQT13qFXoBgPqyIzKhznOb6tw3I87oy1lri67ZPC8T7fSxItPB ZiksVnwYTJeunNRiKmM8dyfsMgSZAi9iigVse/a8GYIuCo22x+3oUZcck+67uOfckh 4dfuQHiZ4sTjQ== From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 3/5] f2fs: report correct st_size for encrypted symlinks Date: Thu, 1 Jul 2021 23:53:48 -0700 Message-Id: <20210702065350.209646-4-ebiggers@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210702065350.209646-1-ebiggers@kernel.org> References: <20210702065350.209646-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers 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 f2fs_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: cbaf042a3cc6 ("f2fs crypto: add symlink encryption") Cc: stable@vger.kernel.org Signed-off-by: Eric Biggers --- fs/f2fs/namei.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index a9cd9cf97229..e2d540ae2293 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -1305,9 +1305,19 @@ static const char *f2fs_encrypted_get_link(struct dentry *dentry, return target; } +static int f2fs_encrypted_symlink_getattr(struct user_namespace *mnt_userns, + const struct path *path, + struct kstat *stat, u32 request_mask, + unsigned int query_flags) +{ + f2fs_getattr(mnt_userns, path, stat, request_mask, query_flags); + + return fscrypt_symlink_getattr(path, stat); +} + const struct inode_operations f2fs_encrypted_symlink_inode_operations = { .get_link = f2fs_encrypted_get_link, - .getattr = f2fs_getattr, + .getattr = f2fs_encrypted_symlink_getattr, .setattr = f2fs_setattr, .listxattr = f2fs_listxattr, }; -- 2.32.0