Skip to contentSkip to conversation

FAILED: patch "[PATCH] ubifs: Fix directory size calculation for symlinks" failed to apply to 4.14-stable tree

PATCH Applied [email protected] 4 participants 4 messages Sep 7, 2018 – Dec 22, 2018

Subsystems (2)
Stable branch UBI file system (UBIFS)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 00ee8b60102862f4daf0814d12a2ea2744fc0b9b Mon Sep 17 00:00:00 2001

From: Richard Weinberger <[email protected]>
Date: Mon, 11 Jun 2018 23:41:09 +0200
Subject: [PATCH] ubifs: Fix directory size calculation for symlinks

We have to account the name of the symlink and not the target length.

Fixes ca7f85be8d6c ("ubifs: Add support for encrypted symlinks")
Cc <[email protected]>
Signed-off-by Richard Weinberger <[email protected]>
fs/ubifs/dir.c +3 -2
index 9da224d4f2da..e8616040bffc 100644
@@ -1123,8 +1123,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;
 	struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1,
 					.new_ino_d = ALIGN(len, 8),

@@ -1151,6 +1150,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);
#1 lore raw
Quoted 5 lines · On Fri, Sep 07, 2018 at 02:44:47PM +0200, [email protected] 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 <[email protected]>.

The attached backported patch should apply to 4.14-stable tree.

--
Regards
Sudip

Quoted 1 line

From b44c2499c02fa7409dbf104193cdfddeaf2316f5 Mon Sep 17 00:00:00 2001

From: Richard Weinberger <[email protected]>
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 <[email protected]>
Signed-off-by Richard Weinberger <[email protected]>
Signed-off-by Sudip Mukherjee <[email protected]>
---
 fs/ubifs/dir.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/ubifs/dir.c +3 -2
index ef820f803176..4e6e32c0c08a 100644
@@ -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);
Signature · 1 line
2.11.0
maintainer
#2 lore raw

Sudip,

Am Donnerstag, 20. Dezember 2018, 21:03:39 CET schrieb Sudip Mukherjee:

Quoted 8 lines · On Fri, Sep 07, 2018 at 02:44:47PM +0200, [email protected] wrote:
Quoted 5 lines

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 <[email protected]>.

The attached backported patch should apply to 4.14-stable tree.

Thanks a lot for finding and backporting this.
I somehow missed this failure notice. :(

Thanks,
//richard

maintainer Applied
#3 lore raw
Quoted 10 lines · Richard Weinberger

Sudip,

Am Donnerstag, 20. Dezember 2018, 21:03:39 CET schrieb Sudip Mukherjee:

Quoted 7 lines · On Fri, Sep 07, 2018 at 02:44:47PM +0200, [email protected] wrote:
Quoted 5 lines

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 <[email protected]>.

Quoted 4 lines
Quoted 1 line

The attached backported patch should apply to 4.14-stable tree.

Thanks a lot for finding and backporting this.
I somehow missed this failure notice. :(

Queued for 4.14, thanks all.

--
Thanks,
Sasha