From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f49.google.com ([209.85.221.49]:43267 "EHLO mail-wr1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389448AbeLTUDo (ORCPT ); Thu, 20 Dec 2018 15:03:44 -0500 Received: by mail-wr1-f49.google.com with SMTP id r10so3014982wrs.10 for ; Thu, 20 Dec 2018 12:03:43 -0800 (PST) Date: Thu, 20 Dec 2018 20:03:39 +0000 From: Sudip Mukherjee To: gregkh@linuxfoundation.org Cc: richard@nod.at, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] ubifs: Fix directory size calculation for symlinks" failed to apply to 4.14-stable tree Message-ID: <20181220200339.klsiltdjhg26ymce@debian> References: <153632428713680@kroah.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="qfdhipdyehqehh37" Content-Disposition: inline In-Reply-To: <153632428713680@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: --qfdhipdyehqehh37 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Sep 07, 2018 at 02:44:47PM +0200, gregkh@linuxfoundation.org wrote: > > The patch below does not apply to the 4.14-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to . The attached backported patch should apply to 4.14-stable tree. -- Regards Sudip --qfdhipdyehqehh37 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-ubifs-Fix-directory-size-calculation-for-symlinks.patch" >>From b44c2499c02fa7409dbf104193cdfddeaf2316f5 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Mon, 11 Jun 2018 23:41:09 +0200 Subject: [PATCH] ubifs: Fix directory size calculation for symlinks commit 00ee8b60102862f4daf0814d12a2ea2744fc0b9b upstream We have to account the name of the symlink and not the target length. Fixes: ca7f85be8d6c ("ubifs: Add support for encrypted symlinks") Cc: Signed-off-by: Richard Weinberger Signed-off-by: Sudip Mukherjee --- fs/ubifs/dir.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index ef820f803176..4e6e32c0c08a 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -1147,8 +1147,7 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, struct ubifs_inode *ui; struct ubifs_inode *dir_ui = ubifs_inode(dir); struct ubifs_info *c = dir->i_sb->s_fs_info; - int err, len = strlen(symname); - int sz_change = CALC_DENT_SIZE(len); + int err, sz_change, len = strlen(symname); struct fscrypt_str disk_link = FSTR_INIT((char *)symname, len + 1); struct fscrypt_symlink_data *sd = NULL; struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, @@ -1189,6 +1188,8 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, if (err) goto out_budg; + sz_change = CALC_DENT_SIZE(fname_len(&nm)); + inode = ubifs_new_inode(c, dir, S_IFLNK | S_IRWXUGO); if (IS_ERR(inode)) { err = PTR_ERR(inode); -- 2.11.0 --qfdhipdyehqehh37--