From patchwork Wed Mar 2 12:13:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 12765889 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 581A7C433EF for ; Wed, 2 Mar 2022 12:13:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241685AbiCBMOU (ORCPT ); Wed, 2 Mar 2022 07:14:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241667AbiCBMOS (ORCPT ); Wed, 2 Mar 2022 07:14:18 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 122842A257 for ; Wed, 2 Mar 2022 04:13:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646223215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/zzDQuZ8eYQqFFfnBFeCOwyCjci2o1PmC4eykL7+NEE=; b=IEomYVlPjvyNUtPww99tRriyrruRQwfcp/60qByfucPU4S9vzrPHWnrtczf+fIXfSInouU YXezGsxxIWD2IlHIA5dqsm8GokrGWcKCR8+QP9gbynJRRhu7VYq8tl/yFT8EyFAo1b35/j HU8wZx9/8KxFDPpwuR0hPsUMqd+ddgs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-519-7wBGgq2LPmOPt29eugNZKQ-1; Wed, 02 Mar 2022 07:13:33 -0500 X-MC-Unique: 7wBGgq2LPmOPt29eugNZKQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5CDE1800D50; Wed, 2 Mar 2022 12:13:32 +0000 (UTC) Received: from lxbceph1.gsslab.pek2.redhat.com (unknown [10.72.47.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D358781EC; Wed, 2 Mar 2022 12:13:30 +0000 (UTC) From: xiubli@redhat.com To: jlayton@kernel.org Cc: idryomov@gmail.com, vshankar@redhat.com, ceph-devel@vger.kernel.org, Xiubo Li Subject: [PATCH v3 1/6] ceph: fail the request when failing to decode dentry names Date: Wed, 2 Mar 2022 20:13:18 +0800 Message-Id: <20220302121323.240432-2-xiubli@redhat.com> In-Reply-To: <20220302121323.240432-1-xiubli@redhat.com> References: <20220302121323.240432-1-xiubli@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org From: Xiubo Li 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 --- 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 44395aae7259..fa3924959537 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 cbeba8a93a07..b573a0f33450 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1904,8 +1904,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 31c1b441c0a1..8d704ddd7291 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -3477,7 +3477,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);