Received: by 10.223.185.116 with SMTP id b49csp5661389wrg; Tue, 27 Feb 2018 18:21:30 -0800 (PST) X-Google-Smtp-Source: AH8x224XG8/D9ysSadskI6ynTGsJb59dRLEMyUI4W6vMk1wBRznToNPkeQz7SsSUMyQ7yVsnOvuo X-Received: by 10.99.103.69 with SMTP id b66mr12838449pgc.233.1519784490338; Tue, 27 Feb 2018 18:21:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519784490; cv=none; d=google.com; s=arc-20160816; b=T/9Rcfe4gfBzBZ+LGoHmma/OrUxDxnAgMJZPDndUYuKEf2fj4Z+rVQ0T57T9tHHKdR mDPw+Z/oCEhkwtuaoniV5KiAo5Dnt3uXt2zWPjQ9Lned7gqYbMBx8BzVuAJgkgPdMwnM Kdzwsc6WrZwUYfsPIVf0Cd1liLc6MvkBx/e+Llt5e3NLL9z87JnsNEYjUDgy43uf5g0u XTbWZIHQbGILMmukqbJm+5fjkfcBKzGFCihHf61ZhWNWdbY8SlaK3W/U0co9qUveAjqr b7o9RTk0N+ewnf+R9/Ssm9PeH/4K8vcaQZuXTZs61zKnIDAMtxIAoY1UFwYnOU2BwVCl zQZg== 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=Ra3u5bTLtdREmRbReLHP0kCIISviEF0jt3/ZDcilsXg=; b=m+xk5W89ajDjhuX9MKXtpUlHbfSqystXfTdlESzlp/aoevpuciHT+3ahKxvz8GwLqN sd0l4OdvRSpzFxEM+5kK3xD/JymAMFKnoo9A0pFh09r7RouYej+U4XrXhK+JZp0YrbMs vYdMa/2WfBHm6yFVtKTXQkWNMW/g5ZuYFgazXZBfFpL4GqYtAsX9zOM+aaVKK1FleudH nZHth9Izqohq6hXc27020k3zolpEzFq6Fg0Tw970VyPtGEZ2WrOUYYJKpuG24F7UmWuw tg+nrmB8twfHCP5Ahz3vcnPTusbopYq1aSjFFFovil7pHof732wuhRfJbvtDFGWS1UjX 5eCQ== 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 1-v6si433344pll.459.2018.02.27.18.21.15; Tue, 27 Feb 2018 18:21:30 -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 S1751863AbeB1CUJ (ORCPT + 99 others); Tue, 27 Feb 2018 21:20:09 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:5716 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751568AbeB1CUI (ORCPT ); Tue, 27 Feb 2018 21:20:08 -0500 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 5BE88F6863E1; Wed, 28 Feb 2018 10:19:55 +0800 (CST) Received: from huawei.com (10.113.189.234) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.361.1; Wed, 28 Feb 2018 10:19:46 +0800 From: Yunlong Song To: , , , , CC: , , , , , Subject: [PATCH v3] f2fs: allocate buffer for decrypting filename to avoid panic Date: Wed, 28 Feb 2018 10:19:40 +0800 Message-ID: <1519784380-83138-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.113.189.234] 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index f00b5ed..de2e295 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -825,9 +825,16 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, int save_len = fstr->len; int err; + de_name.name = f2fs_kmalloc(sbi, de_name.len, GFP_NOFS); + if (!de_name.name) + return -ENOMEM; + + memcpy(de_name.name, d->filename[bit_pos], de_name.len); + 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