| Message ID | 20220303032640.521999-2-xiubli@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ceph: misc fix for fscrypt | expand |
On Thu, 2022-03-03 at 11:26 +0800, xiubli@redhat.com wrote: > From: Xiubo Li <xiubli@redhat.com> > > If we just skip the corrupt dentry names without setting the rde's > offset it will crash in ceph_readdir(): > > ------------[ cut here ]------------ > kernel BUG at fs/ceph/dir.c:537! > invalid opcode: 0000 [#1] PREEMPT SMP KASAN NOPTI > CPU: 16 PID: 21641 Comm: ls Tainted: G E 5.17.0-rc2+ #92 > Hardware name: Red Hat RHEV Hypervisor, BIOS 1.11.0-2.el7 04/01/2014 > > The corresponding code in ceph_readdir() is: > > BUG_ON(rde->offset < ctx->pos); > > For now let's just fail the readdir request since it's nasty to > handle it and will do better error handling later in future. > > Signed-off-by: Xiubo Li <xiubli@redhat.com> > --- > fs/ceph/dir.c | 13 +++++++------ > fs/ceph/inode.c | 5 +++-- > fs/ceph/mds_client.c | 2 +- > 3 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c > index bdd757690a11..4da59810b036 100644 > --- a/fs/ceph/dir.c > +++ b/fs/ceph/dir.c > @@ -537,6 +537,13 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) > .ctext_len = rde->altname_len }; > u32 olen = oname.len; > > + err = ceph_fname_to_usr(&fname, &tname, &oname, NULL); > + if (err) { > + pr_err("%s unable to decode %.*s, got %d\n", __func__, > + rde->name_len, rde->name, err); > + goto out; > + } > + > BUG_ON(rde->offset < ctx->pos); > BUG_ON(!rde->inode.in); > > @@ -545,12 +552,6 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) > i, rinfo->dir_nr, ctx->pos, > rde->name_len, rde->name, &rde->inode.in); > > - err = ceph_fname_to_usr(&fname, &tname, &oname, NULL); > - if (err) { > - dout("Unable to decode %.*s. Skipping it.\n", rde->name_len, rde->name); > - continue; > - } > - > if (!dir_emit(ctx, oname.name, oname.len, > ceph_present_ino(inode->i_sb, le64_to_cpu(rde->inode.in->ino)), > le32_to_cpu(rde->inode.in->mode) >> 12)) { > diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c > index d842ccb15667..e5a9838981ba 100644 > --- a/fs/ceph/inode.c > +++ b/fs/ceph/inode.c > @@ -1897,8 +1897,9 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, > > err = ceph_fname_to_usr(&fname, &tname, &oname, &is_nokey); > if (err) { > - dout("Unable to decode %.*s. Skipping it.", rde->name_len, rde->name); > - continue; > + pr_err("%s unable to decode %.*s, got %d\n", __func__, > + rde->name_len, rde->name, err); > + goto out; > } > > dname.name = oname.name; > diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c > index 34fc7c226b0d..f0d2442187a3 100644 > --- a/fs/ceph/mds_client.c > +++ b/fs/ceph/mds_client.c > @@ -3449,7 +3449,7 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) > if (err == 0) { > if (result == 0 && (req->r_op == CEPH_MDS_OP_READDIR || > req->r_op == CEPH_MDS_OP_LSSNAP)) > - ceph_readdir_prepopulate(req, req->r_session); > + err = ceph_readdir_prepopulate(req, req->r_session); > } > current->journal_info = NULL; > mutex_unlock(&req->r_fill_mutex); Reviewed-by: Jeff Layton <jlayton@kernel.org>
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index bdd757690a11..4da59810b036 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -537,6 +537,13 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) .ctext_len = rde->altname_len }; u32 olen = oname.len; + err = ceph_fname_to_usr(&fname, &tname, &oname, NULL); + if (err) { + pr_err("%s unable to decode %.*s, got %d\n", __func__, + rde->name_len, rde->name, err); + goto out; + } + BUG_ON(rde->offset < ctx->pos); BUG_ON(!rde->inode.in); @@ -545,12 +552,6 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) i, rinfo->dir_nr, ctx->pos, rde->name_len, rde->name, &rde->inode.in); - err = ceph_fname_to_usr(&fname, &tname, &oname, NULL); - if (err) { - dout("Unable to decode %.*s. Skipping it.\n", rde->name_len, rde->name); - continue; - } - if (!dir_emit(ctx, oname.name, oname.len, ceph_present_ino(inode->i_sb, le64_to_cpu(rde->inode.in->ino)), le32_to_cpu(rde->inode.in->mode) >> 12)) { diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index d842ccb15667..e5a9838981ba 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1897,8 +1897,9 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, err = ceph_fname_to_usr(&fname, &tname, &oname, &is_nokey); if (err) { - dout("Unable to decode %.*s. Skipping it.", rde->name_len, rde->name); - continue; + pr_err("%s unable to decode %.*s, got %d\n", __func__, + rde->name_len, rde->name, err); + goto out; } dname.name = oname.name; diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 34fc7c226b0d..f0d2442187a3 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -3449,7 +3449,7 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) if (err == 0) { if (result == 0 && (req->r_op == CEPH_MDS_OP_READDIR || req->r_op == CEPH_MDS_OP_LSSNAP)) - ceph_readdir_prepopulate(req, req->r_session); + err = ceph_readdir_prepopulate(req, req->r_session); } current->journal_info = NULL; mutex_unlock(&req->r_fill_mutex);