Received: by 10.223.185.116 with SMTP id b49csp3286007wrg; Sun, 25 Feb 2018 18:59:31 -0800 (PST) X-Google-Smtp-Source: AH8x225rFJE38UjVafzWFfDGy/9bi+wMdTwntqT0cvc/zR80Un2uEkvQ3eYdPJqylIS+7eLfiPun X-Received: by 2002:a17:902:61:: with SMTP id 88-v6mr9386434pla.428.1519613971849; Sun, 25 Feb 2018 18:59:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519613971; cv=none; d=google.com; s=arc-20160816; b=p0zVkiK0umd7/jYkZgKXJOnmvTYYmbai7xl13SZEEXDTAPs/b3cNWRGjOwjfOAVMIG piBZxMEO21wb/g/Z7eXcIDTDC+7oOqPiBLSfPYuFrEw8RZCk+xqU5ArrrchkY5uIasVU yQLxITqdJauy0Kdu4GFeX6gYiavei9aBedfn21lrmn1xADQBJxGW7axY5ufU7IoLHWCk /1eF6sNPQgD5CfBq8W1ooSGKbZkXoTpXl1PFxzNRSKylz90S4kSHtMO/IFbmxkVQdeLY FB0gc3MXbr0LPy/ZVvdwkuCJ/5YQRhv9cdhTrsF0sjrfpPDKxKkkmePvTUwbG+BskyNK qLdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=9bFdTwZtXu64Ny9zdx89xbJac/vrMu5xlGqSQd2jR0A=; b=kJTxTrhrNqsg4LcXcbdQksf8M0zzbwzwMZ/J1KWgGJgENLo7Dywyj/7Yi105NTLM8H 1w39B8XSSf/64a9v6uXOW74WpnBsgVgkf1SXKypEpLheCKBxxNoan69+c3mJebULKwje B7HUHQzyeqUDJK19C3TABz9pC/Iof8owaprFq9AIs1oi8dS541Wz/PohEPy+SQG7v/8V OWRlW8aYmPm97lJgQg0bWOYh53KVBUU6zW0I7HTg89VICNN3x3ToPBNrOwynT1T1p57G jt6/1hVINtre4xKwF6WJ/oPvg1pWjnvtqxfC+fwA/V6B3XS8z6UarntOndjm/vzXaNxS bcUg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bf3-v6si2120530plb.477.2018.02.25.18.59.17; Sun, 25 Feb 2018 18:59:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752109AbeBZC6l (ORCPT + 99 others); Sun, 25 Feb 2018 21:58:41 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:37472 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751945AbeBZC6k (ORCPT ); Sun, 25 Feb 2018 21:58:40 -0500 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 043D81F94230F; Mon, 26 Feb 2018 10:58:27 +0800 (CST) Received: from huawei.com (10.107.193.250) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.361.1; Mon, 26 Feb 2018 10:58:19 +0800 From: Yunlong Song To: , , , , CC: , , , , , Subject: [PATCH v2] f2fs: allocate buffer for decrypting filename to avoid panic Date: Mon, 26 Feb 2018 10:57:55 +0800 Message-ID: <1519613876-153437-1-git-send-email-yunlong.song@huawei.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1519463698-60555-1-git-send-email-yunlong.song@huawei.com> References: <1519463698-60555-1-git-send-email-yunlong.song@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.193.250] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In some platforms (such as arm), high memory is used, then the decrypting filename will cause panic, the reason see commit 569cf1876a32e574ba8a7fb825cd91bafd003882 ("f2fs crypto: allocate buffer for decrypting filename"): We got dentry pages from high_mem, and its address space directly goes into the decryption path via f2fs_fname_disk_to_usr. But, sg_init_one assumes the address is not from high_mem, so we can get this panic since it doesn't call kmap_high but kunmap_high is triggered at the end. kernel BUG at ../../../../../../kernel/mm/highmem.c:290! Internal error: Oops - BUG: 0 [#1] PREEMPT SMP ARM ... (kunmap_high+0xb0/0xb8) from [] (__kunmap_atomic+0xa0/0xa4) (__kunmap_atomic+0xa0/0xa4) from [] (blkcipher_walk_done+0x128/0x1ec) (blkcipher_walk_done+0x128/0x1ec) from [] (crypto_cbc_decrypt+0xc0/0x170) (crypto_cbc_decrypt+0xc0/0x170) from [] (crypto_cts_decrypt+0xc0/0x114) (crypto_cts_decrypt+0xc0/0x114) from [] (async_decrypt+0x40/0x48) (async_decrypt+0x40/0x48) from [] (f2fs_fname_disk_to_usr+0x124/0x304) (f2fs_fname_disk_to_usr+0x124/0x304) from [] (f2fs_fill_dentries+0xac/0x188) (f2fs_fill_dentries+0xac/0x188) from [] (f2fs_readdir+0x1f0/0x300) (f2fs_readdir+0x1f0/0x300) from [] (vfs_readdir+0x90/0xb4) (vfs_readdir+0x90/0xb4) from [] (SyS_getdents64+0x64/0xcc) (SyS_getdents64+0x64/0xcc) from [] (ret_fast_syscall+0x0/0x30) Howerver, later patches: commit e06f86e61d7a67fe6e826010f57aa39c674f4b1b ("f2fs crypto: avoid unneeded memory allocation in ->readdir") reverts the codes, which causes panic again in arm, so let's add part of the old patch again for dentry page. Signed-off-by: Yunlong Song --- fs/f2fs/dir.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index f00b5ed..23fff48 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -825,9 +825,15 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, int save_len = fstr->len; int err; + de_name.name = kmemdup(d->filename[bit_pos], + de_name.len, GFP_NOFS); + if (!de_name.name) + return -ENOMEM; + err = fscrypt_fname_disk_to_usr(d->inode, (u32)de->hash_code, 0, &de_name, fstr); + kfree(de_name.name); if (err) return err; -- 1.8.5.2