From patchwork Fri Jul 3 06:42:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 11640999 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5277B913 for ; Fri, 3 Jul 2020 06:47:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 12CC7208C7 for ; Fri, 3 Jul 2020 06:47:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="jKijWvVl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726169AbgGCGry (ORCPT ); Fri, 3 Jul 2020 02:47:54 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:58576 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726111AbgGCGry (ORCPT ); Fri, 3 Jul 2020 02:47:54 -0400 Received: from epcas1p2.samsung.com (unknown [182.195.41.46]) by mailout2.samsung.com (KnoxPortal) with ESMTP id 20200703064752epoutp023cb1a7aa789a79edb409e5fa73ca9cc8~eK0ANaaiN1551815518epoutp02u for ; Fri, 3 Jul 2020 06:47:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.samsung.com 20200703064752epoutp023cb1a7aa789a79edb409e5fa73ca9cc8~eK0ANaaiN1551815518epoutp02u DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1593758872; bh=l+vPx0QETbwwMm5Uc0hmIJO3kNYKOZFj7CLABNrviDk=; h=From:To:Cc:Subject:Date:References:From; b=jKijWvVlQ4ZnksPNZHOR8BYpg2LXeX97IZRCqxomb1pNLFchbzWgoldodXALMyGA9 VsXkc/bitYfHZpeoycttAZ+NKxie0dY0qXXRVzJyKg3PC2FfIFWHjIGibwi5RQu06s yfzRLXdeBLGHb2tJO8pH2yNCTf3zM7JLQ2GwtEas= Received: from epsnrtp1.localdomain (unknown [182.195.42.162]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20200703064751epcas1p1122c3904fcee1fc9fd83a47c5b4c011a~eKz-6JU553214832148epcas1p1s; Fri, 3 Jul 2020 06:47:51 +0000 (GMT) Received: from epsmges1p1.samsung.com (unknown [182.195.40.161]) by epsnrtp1.localdomain (Postfix) with ESMTP id 49yls268ptzMqYm8; Fri, 3 Jul 2020 06:47:50 +0000 (GMT) Received: from epcas1p1.samsung.com ( [182.195.41.45]) by epsmges1p1.samsung.com (Symantec Messaging Gateway) with SMTP id 03.37.18978.594DEFE5; Fri, 3 Jul 2020 15:47:49 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200703064749epcas1p142abf1759a90450434ff7d7fbc7dd116~eKz9nYzam0665306653epcas1p1E; Fri, 3 Jul 2020 06:47:49 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200703064749epsmtrp1399bec082d12053d066592cd962a95bf~eKz9htWvx0874908749epsmtrp1t; Fri, 3 Jul 2020 06:47:49 +0000 (GMT) X-AuditID: b6c32a35-603ff70000004a22-99-5efed49522ee Received: from epsmtip1.samsung.com ( [182.195.34.30]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id A0.61.08382.594DEFE5; Fri, 3 Jul 2020 15:47:49 +0900 (KST) Received: from localhost.localdomain (unknown [10.88.103.87]) by epsmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200703064749epsmtip15dd5f81583e4e46e196aa1bc004dfa86~eKz9Vt65z0033000330epsmtip1H; Fri, 3 Jul 2020 06:47:49 +0000 (GMT) From: Namjae Jeon To: linux-fsdevel@vger.kernel.org Cc: sj1557.seo@samsung.com, kohada.t2@gmail.com, Namjae Jeon , stable@vger.kernel.org Subject: [PATCH 1/2] exfat: fix overflow issue in exfat_cluster_to_sector() Date: Fri, 3 Jul 2020 15:42:36 +0900 Message-Id: <20200703064237.12963-1-namjae.jeon@samsung.com> X-Mailer: git-send-email 2.17.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrGKsWRmVeSWpSXmKPExsWy7bCmru7UK//iDK6s0LH4Mfc2i8WevSdZ LH5Mr7fY8u8Iq8WCjY8YHVg9ds66y+7Rt2UVo8fnTXIBzFE5NhmpiSmpRQqpecn5KZl56bZK 3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlAG5UUyhJzSoFCAYnFxUr6djZF+aUlqQoZ +cUltkqpBSk5BYYGBXrFibnFpXnpesn5uVaGBgZGpkCVCTkZi3s+MRb8Yq/YMt+tgfExWxcj J4eEgInE5S2rGUFsIYEdjBJHHpdB2J8YJZqvRXYxcgHZ3xglVtxfzwjTcKd3NStEYi+jxObu KewQDlDHjEvrmbsYOTjYBLQl/mwRBTFFBBQlLr93AullFiiQ6Dj+lgXEFhbwljj/cD4TiM0i oCrx68x5MJtXwEbi6Y1mdohd8hKrNxxgBhkvIdDNLrG/dT9UwkXi06NOKFtY4tXxLVC2lMTL /jZ2kL0SAtUSH/czQ4Q7GCVefLeFsI0lbq7fwApSwiygKbF+lz5EWFFi5++5jBBn8km8+9rD CjGFV6KjTQiiRFWi79JhJghbWqKr/QPUUg+JyzemQ4MwVuLfzOUsExhlZyEsWMDIuIpRLLWg ODc9tdiwwBA5fjYxghOQlukOxolvP+gdYmTiYDzEKMHBrCTCm6D6L06INyWxsiq1KD++qDQn tfgQoykwuCYyS4km5wNTYF5JvKGpkbGxsYWJmbmZqbGSOK+4zIU4IYH0xJLU7NTUgtQimD4m Dk6pBibfZZpLppxY5lh9KtRoxqPlMZYzNvXOZ5zXfdPvXraxZoaCq5Sd/Q6PnQyfdOfbKsR9 a9BpWHEt+wF/52mzZzefvtNTnhDsnSSfvv+l775MT9ZP/r+fyfJtTdg5t3TK6g4v9ivpnfV1 WioVr262BtbUMf4/W9q0UUXUuGFrAmuvdaCa6ZquyROTeg7HHLkjvqllFr/BQn+ds3KXkpVO iyp37/x0yj1x6m7RUl0jFRdFhmJbq00vkm7EzNBh0rXetKtR0nbty66EosOswSdbfNPlchWt LdMvyR2dfe/3caFV3Gzaf8puqSzIbto1VbF7UfcmrfaLZjZTX4SwtJSeaLS1l17a8sqlw+AS 4+qJSizFGYmGWsxFxYkAkZrhyskDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGJMWRmVeSWpSXmKPExsWy7bCSnO7UK//iDK5uErT4Mfc2i8WevSdZ LH5Mr7fY8u8Iq8WCjY8YHVg9ds66y+7Rt2UVo8fnTXIBzFFcNimpOZllqUX6dglcGYt7PjEW /GKv2DLfrYHxMVsXIyeHhICJxJ3e1axdjFwcQgK7GSX+HuxjhUhISxw7cYa5i5EDyBaWOHy4 GKLmA6PE1Jdz2EDibALaEn+2iIKYIgKKEpffO4F0MguUSMw794IRxBYW8JY4/3A+E4jNIqAq 8evMeTCbV8BG4umNZnaITfISqzccYJ7AyLOAkWEVo2RqQXFuem6xYYFhXmq5XnFibnFpXrpe cn7uJkZwUGhp7mDcvuqD3iFGJg7GQ4wSHMxKIrwJqv/ihHhTEiurUovy44tKc1KLDzFKc7Ao ifPeKFwYJySQnliSmp2aWpBaBJNl4uCUamCa8zttsYpy9TnnvwHH57NdkF1Up7c+s0JpUw1j 7iHhPQXv8oqqPnx7NL9x6dMCkfDN4YJTz7Fu1TdJ+Xx9K0upsHr/T5EW+2RpZcXibOPWNkOe L4tYaj5suT23McDyRH7ga6NXfy+97i+POr8jcmnMof3VkyyK1ulZX2etCd2U6VbxTiIrNJ2h PzBlWfx/N8b7sxPMnsQKJah2/Zk+67iP/JNJB7X32TDahs4wMZPuayvb9TTzf8f3SwZH2/Vq H2+Q+fNapPTQSlWh7Y/Wfrzos3TFN4WnV3Q/KTI1MopIVjyU0zueyRl1w3T9DgtvZkmZmJWy zO6iqgwrufZbeZnwC4pcL1taeuu+5Zd125RYijMSDbWYi4oTAcpu2BJ5AgAA X-CMS-MailID: 20200703064749epcas1p142abf1759a90450434ff7d7fbc7dd116 X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20200703064749epcas1p142abf1759a90450434ff7d7fbc7dd116 References: Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org An overflow issue can occur while calculating sector in exfat_cluster_to_sector(). It needs to cast clus's type to sector_t before left shifting. Fixes: 1acf1a564b60 ("exfat: add in-memory and on-disk structures and headers") Cc: stable@vger.kernel.org # v5.7 Reviewed-by: Sungjong Seo Signed-off-by: Namjae Jeon --- fs/exfat/exfat_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/exfat/exfat_fs.h b/fs/exfat/exfat_fs.h index 3aed8e22087a..cb51d6e83199 100644 --- a/fs/exfat/exfat_fs.h +++ b/fs/exfat/exfat_fs.h @@ -368,7 +368,7 @@ static inline bool exfat_is_last_sector_in_cluster(struct exfat_sb_info *sbi, static inline sector_t exfat_cluster_to_sector(struct exfat_sb_info *sbi, unsigned int clus) { - return ((clus - EXFAT_RESERVED_CLUSTERS) << sbi->sect_per_clus_bits) + + return ((sector_t)(clus - EXFAT_RESERVED_CLUSTERS) << sbi->sect_per_clus_bits) + sbi->data_start_sector; } From patchwork Fri Jul 3 06:42:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 11641001 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0ADD86C1 for ; Fri, 3 Jul 2020 06:47:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E028120702 for ; Fri, 3 Jul 2020 06:47:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="Tpqa4wqk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726196AbgGCGr4 (ORCPT ); Fri, 3 Jul 2020 02:47:56 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:60476 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725764AbgGCGrz (ORCPT ); Fri, 3 Jul 2020 02:47:55 -0400 Received: from epcas1p1.samsung.com (unknown [182.195.41.45]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20200703064752epoutp04bd780d437959df7a75fcbd59d340c60b~eKz--Yna40408604086epoutp04j for ; Fri, 3 Jul 2020 06:47:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20200703064752epoutp04bd780d437959df7a75fcbd59d340c60b~eKz--Yna40408604086epoutp04j DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1593758872; bh=jm6O3Uv0Bzvx8p6MvcNZv+0tmou8t7Cj9gm076+ZDlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tpqa4wqkOpHpWrI27eEyvgqz09kg6qnt7bXOG//UlvPR7964aVEUEp04D1fTR69jI DLtlaNjw5ZsenhyLRszb5YTJAB2cecTDXdgHRGEBScgGsDjpxJLZFex8K8irsKgAcJ htDvtfHHr3cYEEV8DMf+0zRbW5zW8gWLQ3F5akzI= Received: from epsnrtp1.localdomain (unknown [182.195.42.162]) by epcas1p2.samsung.com (KnoxPortal) with ESMTP id 20200703064751epcas1p25156dff15c705ee1730e470942fcf7c5~eKz-uD53T0329603296epcas1p2O; Fri, 3 Jul 2020 06:47:51 +0000 (GMT) Received: from epsmges1p3.samsung.com (unknown [182.195.40.162]) by epsnrtp1.localdomain (Postfix) with ESMTP id 49yls253MBzMqYlv; Fri, 3 Jul 2020 06:47:50 +0000 (GMT) Received: from epcas1p4.samsung.com ( [182.195.41.48]) by epsmges1p3.samsung.com (Symantec Messaging Gateway) with SMTP id AB.A4.29173.694DEFE5; Fri, 3 Jul 2020 15:47:50 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas1p4.samsung.com (KnoxPortal) with ESMTPA id 20200703064750epcas1p487820ba4670511e02410c3a9ffbf8f89~eKz_XMrFR0108901089epcas1p4Y; Fri, 3 Jul 2020 06:47:50 +0000 (GMT) Received: from epsmgms1p2.samsung.com (unknown [182.195.42.42]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200703064750epsmtrp2d260d2dbf4c713f29047ff45db020cf8~eKz_WbgAs0903609036epsmtrp2r; Fri, 3 Jul 2020 06:47:50 +0000 (GMT) X-AuditID: b6c32a37-9cdff700000071f5-05-5efed49625b1 Received: from epsmtip1.samsung.com ( [182.195.34.30]) by epsmgms1p2.samsung.com (Symantec Messaging Gateway) with SMTP id D7.45.08303.694DEFE5; Fri, 3 Jul 2020 15:47:50 +0900 (KST) Received: from localhost.localdomain (unknown [10.88.103.87]) by epsmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200703064749epsmtip1cfcf448823c20aaa7a035cec4b15f9e5~eKz_HiGAw0033300333epsmtip1F; Fri, 3 Jul 2020 06:47:49 +0000 (GMT) From: Namjae Jeon To: linux-fsdevel@vger.kernel.org Cc: sj1557.seo@samsung.com, kohada.t2@gmail.com, Namjae Jeon , stable@vger.kernel.org Subject: [PATCH 2/2] exfat: fix wrong hint_stat initialization in exfat_find_dir_entry() Date: Fri, 3 Jul 2020 15:42:37 +0900 Message-Id: <20200703064237.12963-2-namjae.jeon@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200703064237.12963-1-namjae.jeon@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMKsWRmVeSWpSXmKPExsWy7bCmge60K//iDJadULX4Mfc2i8WevSdZ LH5Mr7fY8u8Iq8WCjY8YHVg9ds66y+7Rt2UVo8fnTXIBzFE5NhmpiSmpRQqpecn5KZl56bZK 3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlAG5UUyhJzSoFCAYnFxUr6djZF+aUlqQoZ +cUltkqpBSk5BYYGBXrFibnFpXnpesn5uVaGBgZGpkCVCTkZC36cYiroZa941/eItYHxPWsX IweHhICJxM8umy5GLg4hgR2MErM2HGaGcD4xSqx9OxXI4QRyPjNK9L5OA7FBGia8+MACUbSL UeLBy36EjvZX/WBj2QS0Jf5sEQUxRQQUJS6/dwLpZRYokOg4/pYFxBYWiJI49mkZO0gJi4Cq xLHfvCBhXgEbicbTT5ghVslLrN5wAMzmFLCVeHP0HdgmCYFV7BKH951jgyhykVh2q58FwhaW eHV8CzuELSXx+d1eNognqyU+7oea2cEo8eK7LYRtLHFz/Qawg5kFNCXW79KHCCtK7Pw9lxHi Yj6Jd197oEHFK9HRJgRRoirRd+kwE4QtLdHV/gFqqYfEzc03WSHhMQEYOEsnMk9glJuFsGEB I+MqRrHUguLc9NRiwwJj5MjaxAhOTVrmOxinvf2gd4iRiYPxEKMEB7OSCG+C6r84Id6UxMqq 1KL8+KLSnNTiQ4ymwKCbyCwlmpwPTI55JfGGpkbGxsYWJmbmZqbGSuK8vlYX4oQE0hNLUrNT UwtSi2D6mDg4pRqYqo4vn8jjJqhx7vqL1yckllqXZhkzbcmaffWJx0q9i4sM0quvb3w7J9W4 O3jNt25l5Tsr4jadbvUJTa194n7UoFCL2aHpkljdrau3XypPX7Fc98zRZ2lbLnTu9BHsypT7 LPrxzKrYxadmCWSb8jx87dt7fu3au9Mdw4xXNTNanZ4QKd70PqhsCuvyNw+2X7ujluq4XGVZ 9ONf0g/uzUzTPHBq4iYWj2vvSsNyq2e8atjzdE5B7AyLOQxfOxn7/5qcWn/1r3/T+eb2qkPZ qRlyTNr72da8nbXM/OjUw7sSk8/z5DLMVmWqTrgS8Fzx+cNtM2YEN/jwujrry+7LKXFMPK6j vqR3rXGddrm3eOmDE0osxRmJhlrMRcWJAPY2kQfWAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLJMWRmVeSWpSXmKPExsWy7bCSnO60K//iDDb2clj8mHubxWLP3pMs Fj+m11ts+XeE1WLBxkeMDqweO2fdZffo27KK0ePzJrkA5igum5TUnMyy1CJ9uwSujAU/TjEV 9LJXvOt7xNrA+J61i5GTQ0LARGLCiw8sXYxcHEICOxglvi55C5WQljh24gxzFyMHkC0scfhw MUTNB0aJK/3PGUHibALaEn+2iIKYIgKKEpffO4F0MguUSMw794IRxBYWiJA4fe4RK0gJi4Cq xLHfvCBhXgEbicbTT5ghFslLrN5wAMzmFLCVeHP0HdhSIaCaBceEJjDyLWBkWMUomVpQnJue W2xYYJSXWq5XnJhbXJqXrpecn7uJERxCWlo7GPes+qB3iJGJg/EQowQHs5IIb4Lqvzgh3pTE yqrUovz4otKc1OJDjNIcLErivF9nLYwTEkhPLEnNTk0tSC2CyTJxcEo1MMU1PwzU1zSau5JB ernHPxZf2eW+3xLMTT9/PShwZQ/TytbYY/PyTnTPWFr85c6Fgpjtz43m72b/4DZBpuHAJGsp 132K9R80n35+eL3w5BYZ7fs3nC7/rrx8r6/HUsCq10sprTJDNO7FiZdBq9I5Apm3G6ruvRC2 jtvZUO3EQ/O8I0xRWyKWLtPsndDgYKto9XYKf1rPf8UZ672eFFQvWTHp5D+xHbIHlORbtvbU crJq+mS+vup9Rmjz9qZXb34W9PvnuvtZtNis/7x0acjlOVNvnHp38RZX1T3b1JX+L/95fmJf dyd/zn+ZGU3Gbw6rrSzedeVdTu+fvMNabcclf24R4tyz4celXxdyLp1SbLinxFKckWioxVxU nAgA8n6U0pACAAA= X-CMS-MailID: 20200703064750epcas1p487820ba4670511e02410c3a9ffbf8f89 X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20200703064750epcas1p487820ba4670511e02410c3a9ffbf8f89 References: <20200703064237.12963-1-namjae.jeon@samsung.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org We found the wrong hint_stat initialization in exfat_find_dir_entry(). It should be initialized when cluster is EXFAT_EOF_CLUSTER. Fixes: ca06197382bd ("exfat: add directory operations") Cc: stable@vger.kernel.org # v5.7 Reviewed-by: Sungjong Seo Signed-off-by: Namjae Jeon --- fs/exfat/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/exfat/dir.c b/fs/exfat/dir.c index f4cea9a7fd02..573659bfbc55 100644 --- a/fs/exfat/dir.c +++ b/fs/exfat/dir.c @@ -1116,7 +1116,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei, ret = exfat_get_next_cluster(sb, &clu.dir); } - if (ret || clu.dir != EXFAT_EOF_CLUSTER) { + if (ret || clu.dir == EXFAT_EOF_CLUSTER) { /* just initialized hint_stat */ hint_stat->clu = p_dir->dir; hint_stat->eidx = 0;