Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp507943img; Thu, 21 Mar 2019 03:03:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzY+OkGxWHYgvKoDX6Bfa3l8JGRXgYmkXGNFJzB79Aq9EupcmALCT0KA+ZJfncBC8CKtrrG X-Received: by 2002:a63:d854:: with SMTP id k20mr2553454pgj.107.1553162593236; Thu, 21 Mar 2019 03:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553162593; cv=none; d=google.com; s=arc-20160816; b=E4tbM5kFrog1TO5R0CsQMptHqhMGAPCYoKanIB26ipYRbZjklMNty6DWUnxfp/wuRl 0ANyjSVZNO8vC6g1kGreaXmQwYyj/efhlLBBQkRLhDHJ97/51adZl37EzPwpy6bWwUul nD0tEHtGxKoKosnvbAn5eYU4/Qz3f+95/pGWnJx2kOxUMkBY3iNP1R149ZfwBy+4egZw K57W48GzhkUV3aq41pNF2nTdur357H+h7bz5m8XovTaHmSHh5ayzinLBYyf0pB0hhbFX MMbZAy8o4FjP0adzhfrWSmWXIYbscwAqItVzqg8FCw+z+xDMmVinV/q5PUj1pEyiWD/P swKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from; bh=PmAwmmiknft46YJP8oyUBkTU/WnlCPXUGjeyNixfu64=; b=GohrmuqoCcSo/H8/aafD6RYO0LJjybS2fZd6w6FRhZi5n77gkX9qrIWKqE5jUCEo9y UiqjeJEjpw8a+vLO800NeRvLeOWMs9/SHiZ647sHVX4rO5oRmQCz3bOE9GWFhZaWdx1N MvFzKKTS36lRZNjV8YhPU0U8HQpqQClcebdLaTnZpUJlZ4rwNO2s72vS2Vkhv2ptwGES a8P8VkuBePU613/k/PFQjBA31a+TfZ1qABQPe5euKsRGavv8US/XiY4B0usWBR2eHb1J 1tJFG0e3ADGzB7CeTDgfjtPcPTRbQ5BwOP+br8HVNeI6ZklAe0bzvNEfp1+zqc6c0AXx vtwg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 15si3810661pgt.261.2019.03.21.03.02.57; Thu, 21 Mar 2019 03:03:13 -0700 (PDT) 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728344AbfCUKAs (ORCPT + 99 others); Thu, 21 Mar 2019 06:00:48 -0400 Received: from out30-54.freemail.mail.aliyun.com ([115.124.30.54]:41844 "EHLO out30-54.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728325AbfCUKAq (ORCPT ); Thu, 21 Mar 2019 06:00:46 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R391e4;CH=green;DM=||false|;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e07487;MF=xuyu@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0TNGmqso_1553162437; Received: from localhost(mailfrom:xuyu@linux.alibaba.com fp:SMTPD_---0TNGmqso_1553162437) by smtp.aliyun-inc.com(127.0.0.1); Thu, 21 Mar 2019 18:00:43 +0800 From: Xu Yu To: daniel@iogearbox.net, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] bpf: do not restore dst_reg when cur_state is freed Date: Thu, 21 Mar 2019 18:00:35 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Syzkaller hit 'KASAN: use-after-free Write in sanitize_ptr_alu' bug. Call trace: dump_stack+0xbf/0x12e print_address_description+0x6a/0x280 kasan_report+0x237/0x360 sanitize_ptr_alu+0x85a/0x8d0 adjust_ptr_min_max_vals+0x8f2/0x1ca0 adjust_reg_min_max_vals+0x8ed/0x22e0 do_check+0x1ca6/0x5d00 bpf_check+0x9ca/0x2570 bpf_prog_load+0xc91/0x1030 __se_sys_bpf+0x61e/0x1f00 do_syscall_64+0xc8/0x550 entry_SYSCALL_64_after_hwframe+0x49/0xbe Fault injection trace:  kfree+0xea/0x290  free_func_state+0x4a/0x60  free_verifier_state+0x61/0xe0  push_stack+0x216/0x2f0 <- inject failslab  sanitize_ptr_alu+0x2b1/0x8d0  adjust_ptr_min_max_vals+0x8f2/0x1ca0  adjust_reg_min_max_vals+0x8ed/0x22e0  do_check+0x1ca6/0x5d00  bpf_check+0x9ca/0x2570  bpf_prog_load+0xc91/0x1030  __se_sys_bpf+0x61e/0x1f00  do_syscall_64+0xc8/0x550  entry_SYSCALL_64_after_hwframe+0x49/0xbe When kzalloc() fails in push_stack(), free_verifier_state() will free current verifier state. As push_stack() returns, dst_reg was restored if ptr_is_dst_reg is false. However, as member of the cur_state, dst_reg is also freed, and error occurs when dereferencing dst_reg. Simply fix it by testing ret of push_stack() before retoring dst_reg. Signed-off-by: Xu Yu --- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index ce166a0..cb1b874 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3368,7 +3368,7 @@ static int sanitize_ptr_alu(struct bpf_verifier_env *env, *dst_reg = *ptr_reg; } ret = push_stack(env, env->insn_idx + 1, env->insn_idx, true); - if (!ptr_is_dst_reg) + if (!ptr_is_dst_reg && ret) *dst_reg = tmp; return !ret ? -EFAULT : 0; } -- 1.8.3.1