From patchwork Wed May 11 18:59:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tadeusz Struk X-Patchwork-Id: 12846554 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 4C93BC433EF for ; Wed, 11 May 2022 18:59:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346532AbiEKS7k (ORCPT ); Wed, 11 May 2022 14:59:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346502AbiEKS7i (ORCPT ); Wed, 11 May 2022 14:59:38 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C3716D3A5 for ; Wed, 11 May 2022 11:59:37 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id 15so2581998pgf.4 for ; Wed, 11 May 2022 11:59:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8sGAQG8dHMKLn+nlsPe/05icv+DfBZPnqj5ZoB1g/UQ=; b=wZV2E92PHLNHqME2ISGsoc8JZxSNdYWfG7d8y4/9sA4UeBrjX1Vx2Lace/4dA85wk/ ILfvKj3XjG9cZVCAMKPAxH9lD20VM/AU9unfqDjD87cKBUMCZlomMOd4AzaKSK1xKvNB CkTgogQZZzeMoIua3YYxVoJXzIihcZkqfezwAmDOP8/yQ3R/96KXJ5qMJzs/OBEn9VBc k518IQ6IuQmkA1P0vgEWvo/UhHsLVcrx/az0T5DjM4u7YSmsRzDE2s2fZV91WspwRWnj yW9jzGWJ71P0TFhoqwFQFiMNKF9y1j5QfYjC3RP1tqfnt40r4lgH8M8gjv7h1+kYa12i CaeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8sGAQG8dHMKLn+nlsPe/05icv+DfBZPnqj5ZoB1g/UQ=; b=dQRK5WNO+RO7q20JKlcDvC8Ji+UPFznMhPa8eiCikdSEIEGaayMLflhHO5roDxXz90 60Ukl0ToTPR+HvKLWfwnOIP8fp5pLQglGz0dkdXcavBtcHivjT8RVgtSohBgxSTC9yZ5 oLJozY1F02JNaq4YntVOy8vzplbZRMglJfQDUUg6f2ID8lHc3GdNcgZCYJUtMlFV0SLT CSorNYxIs5mq1U+dwNJPNa/cDaLKso4hAr1vrPVt7Ab/JQs3nIqPS3bkvU1DTU5nAL7g SpnQUABKBRsk4o5eixSchqBeTWWqOuo7aTOXHVmGmChDVRb/2ZE1Pnmrdxo3EHns1F23 /kHA== X-Gm-Message-State: AOAM531oa1YzdUXvluH/a68Eu8+BJbW/sQSfzaGEr9v1GBMCWtDIIzPm OihjKqAuBYDAqPZZyBNYpRNcVw== X-Google-Smtp-Source: ABdhPJyuiOoKNfa17Y3IGmkUvslc+8XNXB9vnFmRfrQOBJZ+U4wDOk7Wf89qsDxFqO0T+kIsUYQY7Q== X-Received: by 2002:a05:6a00:15d3:b0:510:3c69:b387 with SMTP id o19-20020a056a0015d300b005103c69b387mr26214468pfu.30.1652295576885; Wed, 11 May 2022 11:59:36 -0700 (PDT) Received: from localhost.localdomain ([50.39.160.154]) by smtp.gmail.com with ESMTPSA id a19-20020a17090aa51300b001d5c571f487sm280709pjq.25.2022.05.11.11.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 11:59:36 -0700 (PDT) From: Tadeusz Struk To: linkinjeon@kernel.org Cc: Tadeusz Struk , Sungjong Seo , linux-fsdevel@vger.kernel.org, stable@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] exfat: move is_valid_cluster to a common header Date: Wed, 11 May 2022 11:59:08 -0700 Message-Id: <20220511185909.175110-1-tadeusz.struk@linaro.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Move the is_valid_cluster() helper from fatent.c to a common header to make it reusable in other *.c files. Cc: Namjae Jeon Cc: Sungjong Seo Cc: linux-fsdevel@vger.kernel.org Cc: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Tadeusz Struk Reviewed-by: Sungjong Seo --- fs/exfat/exfat_fs.h | 6 ++++++ fs/exfat/fatent.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/exfat/exfat_fs.h b/fs/exfat/exfat_fs.h index c6800b880920..42d06c68d5c5 100644 --- a/fs/exfat/exfat_fs.h +++ b/fs/exfat/exfat_fs.h @@ -381,6 +381,12 @@ static inline int exfat_sector_to_cluster(struct exfat_sb_info *sbi, EXFAT_RESERVED_CLUSTERS; } +static inline bool is_valid_cluster(struct exfat_sb_info *sbi, + unsigned int clus) +{ + return clus >= EXFAT_FIRST_CLUSTER && clus < sbi->num_clusters; +} + /* super.c */ int exfat_set_volume_dirty(struct super_block *sb); int exfat_clear_volume_dirty(struct super_block *sb); diff --git a/fs/exfat/fatent.c b/fs/exfat/fatent.c index a3464e56a7e1..421c27353104 100644 --- a/fs/exfat/fatent.c +++ b/fs/exfat/fatent.c @@ -81,12 +81,6 @@ int exfat_ent_set(struct super_block *sb, unsigned int loc, return 0; } -static inline bool is_valid_cluster(struct exfat_sb_info *sbi, - unsigned int clus) -{ - return clus >= EXFAT_FIRST_CLUSTER && clus < sbi->num_clusters; -} - int exfat_ent_get(struct super_block *sb, unsigned int loc, unsigned int *content) { From patchwork Wed May 11 18:59:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tadeusz Struk X-Patchwork-Id: 12846555 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 8A24CC43219 for ; Wed, 11 May 2022 18:59:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346541AbiEKS7l (ORCPT ); Wed, 11 May 2022 14:59:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346521AbiEKS7j (ORCPT ); Wed, 11 May 2022 14:59:39 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13A8D6D3B5 for ; Wed, 11 May 2022 11:59:38 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id c14so2773929pfn.2 for ; Wed, 11 May 2022 11:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2MbxQToswSlU3uGoWcNi5INJYQyZuFk9/eAJQ7cdhmM=; b=CAnupYTRbk5GC5fKicsn72UhgiuO5+FGnHpN87ZAcpAMVTT4w/YH0sYOJ9/Tc0RzxO lQCza6ElQrlD7hiEde2IBjhNwEFNRpfIueSDbPkO7C+mO/Nl7pyoMf/XiMK/Bs8vcn+s 31Yx8MEdBlvr8VlIy/C27slzdi8rukc9+gAXnIE284BO3FYVBjNKVIlJ7W0eB5J9VuYJ 8KXyHs1ICf3Hn/Q1lEQWNtVn8DP8lwdxoO+lq9VY7lOInslCI7HV00mzbUq8bxf57lVE uVZrHtFwPw3FGwLhoXTPPLgl5vO4eQnTL0pqdJZsUITCwcR3xQVeYjkdmHCnGk0PH94h BN/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2MbxQToswSlU3uGoWcNi5INJYQyZuFk9/eAJQ7cdhmM=; b=aPgMrUJ2OZ+8YuuYMsM3QwlBzy3QpO8OQDoJayV2o0Zv7q+BmIADT1CA3gkQJKjukE LoxlDoa3IHAwDp5tGLPAYm07lQfMohA7EbOi5obHatb752Pxh1p8zJLea1so9rgPwkbw BbNwstjorB+odN1P7dYINNFC7bn6QrbbELD45lDB9GW+/JHZAXQktzV6jzTocVNrWnWD UsbkyMoO9Drbooio7m8SFCJsL3udOHlDxMM2X7TUwFWPINnM3eclltribr+xY1UjLkGD VVR/AOrpBKJ4816b2qTQtEr46yriuobtqTPkiedOvqfn2bJ1ZXmsibEVk0tSsA8SY+M4 h3eg== X-Gm-Message-State: AOAM532EEajZFgN6sxXVzwG3Lbd7qIs0aNP1fvdZ0GGj4KTjS8SFMsbw ddclUkFBkP+76MQP8JW1BR5UkQtU02VPQw== X-Google-Smtp-Source: ABdhPJz9bBTfcx7W1OwKidWuK66EB5cdlNK1lVelNf4ILnzBY58KVHr7ms6mzbrWQdITVzEymsyxoA== X-Received: by 2002:a63:5552:0:b0:3c2:363b:abe1 with SMTP id f18-20020a635552000000b003c2363babe1mr21396007pgm.304.1652295577623; Wed, 11 May 2022 11:59:37 -0700 (PDT) Received: from localhost.localdomain ([50.39.160.154]) by smtp.gmail.com with ESMTPSA id a19-20020a17090aa51300b001d5c571f487sm280709pjq.25.2022.05.11.11.59.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 11:59:37 -0700 (PDT) From: Tadeusz Struk To: linkinjeon@kernel.org Cc: Tadeusz Struk , Sungjong Seo , linux-fsdevel@vger.kernel.org, stable@vger.kernel.org, linux-kernel@vger.kernel.org, syzbot+a4087e40b9c13aad7892@syzkaller.appspotmail.com Subject: [PATCH v2 2/2] exfat: check if cluster num is valid Date: Wed, 11 May 2022 11:59:09 -0700 Message-Id: <20220511185909.175110-2-tadeusz.struk@linaro.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220511185909.175110-1-tadeusz.struk@linaro.org> References: <20220511185909.175110-1-tadeusz.struk@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Syzbot reported slab-out-of-bounds read in exfat_clear_bitmap. This was triggered by reproducer calling truncute with size 0, which causes the following trace: BUG: KASAN: slab-out-of-bounds in exfat_clear_bitmap+0x147/0x490 fs/exfat/balloc.c:174 Read of size 8 at addr ffff888115aa9508 by task syz-executor251/365 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack_lvl+0x1e2/0x24b lib/dump_stack.c:118 print_address_description+0x81/0x3c0 mm/kasan/report.c:233 __kasan_report mm/kasan/report.c:419 [inline] kasan_report+0x1a4/0x1f0 mm/kasan/report.c:436 __asan_report_load8_noabort+0x14/0x20 mm/kasan/report_generic.c:309 exfat_clear_bitmap+0x147/0x490 fs/exfat/balloc.c:174 exfat_free_cluster+0x25a/0x4a0 fs/exfat/fatent.c:181 __exfat_truncate+0x99e/0xe00 fs/exfat/file.c:217 exfat_truncate+0x11b/0x4f0 fs/exfat/file.c:243 exfat_setattr+0xa03/0xd40 fs/exfat/file.c:339 notify_change+0xb76/0xe10 fs/attr.c:336 do_truncate+0x1ea/0x2d0 fs/open.c:65 Add checks to validate if cluster number is within valid range in exfat_clear_bitmap() and exfat_set_bitmap() Cc: Namjae Jeon Cc: Sungjong Seo Cc: linux-fsdevel@vger.kernel.org Cc: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org Link: https://syzkaller.appspot.com/bug?id=50381fc73821ecae743b8cf24b4c9a04776f767c Reported-by: syzbot+a4087e40b9c13aad7892@syzkaller.appspotmail.com Fixes: 1e49a94cf707 ("exfat: add bitmap operations") Signed-off-by: Tadeusz Struk Reviewed-by: Sungjong Seo --- v2: - Use is_valid_cluster() helper to validate clu --- fs/exfat/balloc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/exfat/balloc.c b/fs/exfat/balloc.c index 03f142307174..92f5b5b5a0d0 100644 --- a/fs/exfat/balloc.c +++ b/fs/exfat/balloc.c @@ -149,6 +149,9 @@ int exfat_set_bitmap(struct inode *inode, unsigned int clu, bool sync) struct exfat_sb_info *sbi = EXFAT_SB(sb); WARN_ON(clu < EXFAT_FIRST_CLUSTER); + if (!is_valid_cluster(sbi, clu)) + return -EINVAL; + ent_idx = CLUSTER_TO_BITMAP_ENT(clu); i = BITMAP_OFFSET_SECTOR_INDEX(sb, ent_idx); b = BITMAP_OFFSET_BIT_IN_SECTOR(sb, ent_idx); @@ -167,6 +170,9 @@ void exfat_clear_bitmap(struct inode *inode, unsigned int clu, bool sync) struct exfat_mount_options *opts = &sbi->options; WARN_ON(clu < EXFAT_FIRST_CLUSTER); + if (!is_valid_cluster(sbi, clu)) + return; + ent_idx = CLUSTER_TO_BITMAP_ENT(clu); i = BITMAP_OFFSET_SECTOR_INDEX(sb, ent_idx); b = BITMAP_OFFSET_BIT_IN_SECTOR(sb, ent_idx);