* [PATCH] ceph: fail the request when failing to decode dentry names
@ 2022-02-28 9:02 xiubli
2022-02-28 9:04 ` [PATCH v2] " Xiubo Li
0 siblings, 1 reply; 2+ messages in thread
From: xiubli @ 2022-02-28 9:02 UTC (permalink / raw)
To: jlayton; +Cc: idryomov, vshankar, ceph-devel, Xiubo Li
From: Xiubo Li <xiubli@redhat.com>
------------[ 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);
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---
V2:
- fail the request instead, because it's hard to handle the
corresponding code in ceph_readdir(). At the same time we
should propagate the error to user space.
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 a449f4a07c07..6be0c1f793c2 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -534,6 +534,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);
@@ -542,12 +549,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 8b0832271fdf..2bc2f02b84e8 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1898,8 +1898,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 914a6e68bb56..94b4c6508044 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -3474,7 +3474,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);
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] ceph: fail the request when failing to decode dentry names
2022-02-28 9:02 [PATCH] ceph: fail the request when failing to decode dentry names xiubli
@ 2022-02-28 9:04 ` Xiubo Li
0 siblings, 0 replies; 2+ messages in thread
From: Xiubo Li @ 2022-02-28 9:04 UTC (permalink / raw)
To: jlayton; +Cc: idryomov, vshankar, ceph-devel
Tag as V2.
On 2/28/22 5:02 PM, xiubli@redhat.com wrote:
> From: Xiubo Li <xiubli@redhat.com>
>
> ------------[ 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);
>
> Signed-off-by: Xiubo Li <xiubli@redhat.com>
> ---
>
> V2:
> - fail the request instead, because it's hard to handle the
> corresponding code in ceph_readdir(). At the same time we
> should propagate the error to user space.
>
>
>
> 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 a449f4a07c07..6be0c1f793c2 100644
> --- a/fs/ceph/dir.c
> +++ b/fs/ceph/dir.c
> @@ -534,6 +534,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);
>
> @@ -542,12 +549,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 8b0832271fdf..2bc2f02b84e8 100644
> --- a/fs/ceph/inode.c
> +++ b/fs/ceph/inode.c
> @@ -1898,8 +1898,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 914a6e68bb56..94b4c6508044 100644
> --- a/fs/ceph/mds_client.c
> +++ b/fs/ceph/mds_client.c
> @@ -3474,7 +3474,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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-28 9:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-28 9:02 [PATCH] ceph: fail the request when failing to decode dentry names xiubli
2022-02-28 9:04 ` [PATCH v2] " Xiubo Li
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.