Received-SPF: pass (google.com: domain of linux-kernel+bounces-50437-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <eacdea9b-4d4c-4833-b7a4-ac0b042c9efa@intel.com>
Date: Fri, 2 Feb 2024 10:43:26 -0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH bpf v3 2/3] x86/mm: Disallow vsyscall page read for
 copy_from_kernel_nofault()
To: Hou Tao <houtao@huaweicloud.com>, <x86@kernel.org>, <bpf@vger.kernel.org>
CC: Dave Hansen <dave.hansen@linux.intel.com>, Andy Lutomirski
	<luto@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Thomas Gleixner
	<tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov
	<bp@alien8.de>, "H . Peter Anvin" <hpa@zytor.com>,
	<linux-kernel@vger.kernel.org>, xingwei lee <xrivendell7@gmail.com>, "Jann
 Horn" <jannh@google.com>, Yonghong Song <yonghong.song@linux.dev>,
	<houtao1@huawei.com>
References: <20240202103935.3154011-1-houtao@huaweicloud.com>
 <20240202103935.3154011-3-houtao@huaweicloud.com>
Content-Language: en-US
From: Sohil Mehta <sohil.mehta@intel.com>
In-Reply-To: <20240202103935.3154011-3-houtao@huaweicloud.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WDNpNVAxZllFditqRnlqQ1BMVWwxZ3BOeWs0eVFUbUFYTG9RT0FFZm4wclh4?=
 =?utf-8?B?dExMajh6SGpBdks0Q2FxcFRRNmdqenEzU1ZoOVJ0N0Q1YkdLN1VSODVhTHFM?=
 =?utf-8?B?NXVaa2VQWTFYYUhCVk5kOFVhdEpwYklKSGRoNzdYYTVhd1duYlI4VVh2L3Ns?=
 =?utf-8?B?cWZCY1dDSThXOCthSU1hOGpTTVAxQ1llVXBINVZGUE83V09UUXdMcllqWW9v?=
 =?utf-8?B?TzAxTWlPcHgxTG1aS2RzblNGZ3orQVplRjU4Y05jcnNqM2d3cDdoVDBXdVFL?=
 =?utf-8?B?YVlBZVpKektWVzI3dDB2QWxKcnFuak5XSkcwZFRWa0w3SGdWam5JcUREbzZh?=
 =?utf-8?B?YlhZSmZtemUwbHBWaHRQOWd1djZGa1VhK2JobG52RllIMVU3eXRXSnZnQTVR?=
 =?utf-8?B?QUNicktTY3dLMVFKUnJNQ010L0lMYUQ2ekZuMVpubE1NYkVWeFJra2JzVlpM?=
 =?utf-8?B?Z0NyYWNJZ0ZocVM4bm9vUnAzSzFJZExWcmFWeWtYaGNQUGJVazVTK3Boc0tB?=
 =?utf-8?B?Ty85L0dJb3JLMXpCVWJtZ1hJbUdkYWhhWlBXdVg5WUFZWjB5amMxeU1KR1dS?=
 =?utf-8?B?UXJpc0xNRk9GTGdLZVV4ckpqYUlzdjVLWVhWek13dkt0aHFKTTg5V243WUVj?=
 =?utf-8?B?VFBiTG4rTk1QTWRiU3B6bHQrMHBFbnZuMERTYXA0TyswbkQrNmU3THA0eWly?=
 =?utf-8?B?ZFpVRng0NXVSeldORTJ1b294ejZLVURvSGRZMmhTV1k4M3lMaE9KOFFNN2wy?=
 =?utf-8?B?M2JBZXdId1RiUnJGVzlxbnYrLy9oOEJwREVEVWRSMTE2Z1NvMzNpOGhXOVVP?=
 =?utf-8?B?Uk9MZEU1OHNEMW5oa3hPaHd5UlRmMTdrNCtTazhVNnUwVlhlWmwzRUdzYjZp?=
 =?utf-8?B?bFBnT0liWXFKY3NjamFKdXY1WEgrVzdNcVFsOGE0SW1tdEwrWUUxc2ZIUmk2?=
 =?utf-8?B?U0pEdzB0a1ZrWGhGeTBFTzY4NUFyTlRYeUdOV2NZUmN6N0lNSHNmRWN6RVg2?=
 =?utf-8?B?RDEwMUV5bS92MHo2ZzFzRG1UUUhEYXRGdktJRnpiZ050NmptNjlvZDE0RCto?=
 =?utf-8?B?QjJLOGVVSXRFYTNnODNMYzg3UWNBQjhCTXEzaXZXNTloK2FuYmliUTZyeTRW?=
 =?utf-8?B?Z3dSekVmdUtiYmVFUkxBd2NscDM5VzJBWlZ5NjNjRmNnSmZWRFZ5UE1yMjJ2?=
 =?utf-8?B?TEpnV3hTd1Znb1BCWXpudllKLy9wTm0rUjc0TzJZdkw4UU84UHUrY2NHTFQ1?=
 =?utf-8?B?ajNGc1k1OUtzSlh6bW5WYmtraEZ6eWloTjJySEZyMlhLN1ZIbjErbGhudzZt?=
 =?utf-8?B?WllqMVR2K3hOYWdiUjY1d2NqcDlvZ3Zna1RxRG1EQzNPRzV3LzJLYkJSRzhY?=
 =?utf-8?B?SGdQWHh3N1BRK1Q0U1pZcnkzVHdrTVpXTExnRXo0K1pPRUdyVmE0M3RxVnhH?=
 =?utf-8?B?NHpqKzhIcEE1TGZETFVJKzJrT2FxT3ZLZWNCdUNpZERXMWdFVVBLMk5tamtG?=
 =?utf-8?B?TUw5NGhRQTQ5WGtrZ0N2YUpHU3lWVldWODkwSWFCOXVJc1lKSFVCaEZGNmdj?=
 =?utf-8?B?UnBiTy9ERW5RTXBxQVhFajIybWJHd00ycldua2VzYUN5ek1IN0VNb2lhSTR4?=
 =?utf-8?B?QVNyeXFhQ21NMFpLb1lKbGkrK2M5RVlMTVZyNGI0Vk1mYkFtdGxuanFLUkQw?=
 =?utf-8?B?RmFEL3VkZDljUm1wVVFDWXowMkpMNmFkUENxSGFGSDUxZVZpdHZoajlPcG9x?=
 =?utf-8?B?VldYaVRvNFAwUG92NHhXZDBLV2c4UFN1bVJJQTdjVmtubmd6dEpFRS82SkN2?=
 =?utf-8?B?dlI4dVJTSHQ4VGxtNkxvZkpLV1ZJWjczakl2NnB0dWZTNG1sQmJmNC9hdkRX?=
 =?utf-8?B?eEFtU3pmYlpkeGpCQzduYUx5M0xjbXdwMjd5Y3AvVkYrSVJNbE4zOWltKy8x?=
 =?utf-8?B?eW1WL01VV3oybFFxYWVZMC9Pa1N3ZnFscE1XRTIvU0xRR3ZXcU1vMncrd0dE?=
 =?utf-8?B?WU9RVVYvTDZTS0FvL2pVTXdYQnUzV05WMEk4WC9ZclRQeDJLZnhKM3BKMXcw?=
 =?utf-8?B?MzZpZWJScWVsQUNXVlhzaHZ5eTlFbFY3NXJzamhzT3pRbFE4cm5TNEhaaVpU?=
 =?utf-8?Q?veVkx3ZLjVUK8z+tKAS75EqU1?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e4c30c96-c230-459c-3dbe-08dc241ed8ac
X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3320.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 18:43:28.5640
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: h4/6EAGO357O+r+shdpjTmLk7eb67ekGqAoaGqRt2DMv8F47BYGzw/LJfDktxd6cfGi8zoMZV3uJVkqkqOiTPQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB7824
X-OriginatorOrg: intel.com

On 2/2/2024 2:39 AM, Hou Tao wrote:
> From: Hou Tao <houtao1@huawei.com>
> 
> When trying to use copy_from_kernel_nofault() to read vsyscall page
> through a bpf program, the following oops was reported:
> 
>   BUG: unable to handle page fault for address: ffffffffff600000
>   #PF: supervisor read access in kernel mode
>   #PF: error_code(0x0000) - not-present page
>   PGD 3231067 P4D 3231067 PUD 3233067 PMD 3235067 PTE 0
>   Oops: 0000 [#1] PREEMPT SMP PTI
>   CPU: 1 PID: 20390 Comm: test_progs ...... 6.7.0+ #58
>   Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) ......
>   RIP: 0010:copy_from_kernel_nofault+0x6f/0x110
>   ......
>   Call Trace:
>    <TASK>
>    ? copy_from_kernel_nofault+0x6f/0x110
>    bpf_probe_read_kernel+0x1d/0x50
>    bpf_prog_2061065e56845f08_do_probe_read+0x51/0x8d
>    trace_call_bpf+0xc5/0x1c0
>    perf_call_bpf_enter.isra.0+0x69/0xb0
>    perf_syscall_enter+0x13e/0x200
>    syscall_trace_enter+0x188/0x1c0
>    do_syscall_64+0xb5/0xe0
>    entry_SYSCALL_64_after_hwframe+0x6e/0x76
>    </TASK>
>   ......
>   ---[ end trace 0000000000000000 ]---
> 
> The oops is triggered when:
> 
> 1) A bpf program uses bpf_probe_read_kernel() to read from the vsyscall
> page and invokes copy_from_kernel_nofault() which in turn calls
> __get_user_asm().
> 
> 2) Because the vsyscall page address is not readable from kernel space,
> a page fault exception is triggered accordingly.
> 
> 3) handle_page_fault() considers the vsyscall page address as a user
> space address instead of a kernel space address. This results in the
> fix-up setup by bpf not being applied and a page_fault_oops() is invoked
> due to SMAP.
> 
> Considering handle_page_fault() has already considered the vsyscall page
> address as a userspace address, fix the problem by disallowing vsyscall
> page read for copy_from_kernel_nofault().
> 
> Originally-by: Thomas Gleixner <tglx@linutronix.de>
> Reported-by: syzbot+72aa0161922eba61b50e@syzkaller.appspotmail.com
> Closes: https://lore.kernel.org/bpf/CAG48ez06TZft=ATH1qh2c5mpS5BT8UakwNkzi6nvK5_djC-4Nw@mail.gmail.com
> Reported-by: xingwei lee <xrivendell7@gmail.com>
> Closes: https://lore.kernel.org/bpf/CABOYnLynjBoFZOf3Z4BhaZkc5hx_kHfsjiW+UWLoB=w33LvScw@mail.gmail.com
> Signed-off-by: Hou Tao <houtao1@huawei.com>
> ---
>  arch/x86/mm/maccess.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 

Reviewed-by: Sohil Mehta <sohil.mehta@intel.com>