From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel•org>, Theodore Ts'o <tytso@mit•edu>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Chandan Rajendra <chandan@linux•vnet.ibm.com>
Subject: linux-next: manual merge of the f2fs tree with the fscrypt tree
Date: Tue, 11 Dec 2018 10:13:22 +1100 [thread overview]
Message-ID: <20181211101322.438946fe@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1545 bytes --]
Hi all,
Today's linux-next merge of the f2fs tree got a conflict in:
fs/f2fs/dir.c
between commit:
848a010287e6 ("f2fs: use IS_ENCRYPTED() to check encryption status")
from the fscrypt tree and commit:
4e240d1bab1e ("f2fs: check memory boundary by insane namelen")
from the f2fs tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/f2fs/dir.c
index cf9e2564388d,c0c845da12fa..000000000000
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@@ -808,7 -808,18 +808,18 @@@ int f2fs_fill_dentries(struct dir_conte
de_name.name = d->filename[bit_pos];
de_name.len = le16_to_cpu(de->name_len);
+ /* check memory boundary before moving forward */
+ bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len));
+ if (unlikely(bit_pos > d->max)) {
+ f2fs_msg(sbi->sb, KERN_WARNING,
+ "%s: corrupted namelen=%d, run fsck to fix.",
+ __func__, le16_to_cpu(de->name_len));
+ set_sbi_flag(sbi, SBI_NEED_FSCK);
+ err = -EINVAL;
+ goto out;
+ }
+
- if (f2fs_encrypted_inode(d->inode)) {
+ if (IS_ENCRYPTED(d->inode)) {
int save_len = fstr->len;
err = fscrypt_fname_disk_to_usr(d->inode,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-12-10 23:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 23:13 Stephen Rothwell [this message]
2019-01-02 0:26 ` linux-next: manual merge of the f2fs tree with the fscrypt tree Stephen Rothwell
2019-01-02 4:56 ` Chandan Rajendra
-- strict thread matches above, loose matches on Subject: below --
2020-07-08 0:38 Stephen Rothwell
2020-08-09 8:44 ` Stephen Rothwell
2020-05-21 0:30 Stephen Rothwell
2018-01-14 22:17 Stephen Rothwell
2017-05-03 23:40 Stephen Rothwell
2017-02-14 22:51 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181211101322.438946fe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chandan@linux$(echo .)vnet.ibm.com \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox