Message ID | 20221223182836.never.866-kees@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp460004wrn; Fri, 23 Dec 2022 10:41:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXvy2F9Qub3QgHh0NWSgzuWj4sYtnUUIHuSkwlAIEoYRlTBoIk3JQPlvgv+97sZrhMggBGzz X-Received: by 2002:a17:902:930b:b0:185:441e:2240 with SMTP id bc11-20020a170902930b00b00185441e2240mr10596335plb.59.1671820890918; Fri, 23 Dec 2022 10:41:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671820890; cv=none; d=google.com; s=arc-20160816; b=ugH7JfAcgMxx6nW+D1Xg+E7Wl/tu35z8qDSdxut/TNgEci7ak3MLM9YarVRcean/MX 3MZUd0u1YjLyHjJj7PO7Q9Le/TEXT/5DdwJ5GaebnLyUlGa/uqFqXIqxMF7hb9Eji+zq 428QgmNUpa+RtwmI3fpnMyKgurP6EjKU0Zk/9b7Ht6Gsuj18MNLp1oTIfeT2Slvvq67L xcgYoppj7nD2xPKzLedKAJLVdAFn5UvdlUIaIFoiXg7PacnSM3ckSdriyWgOTisZQ7Gb InAIOR4nEIFzM02ULsH5dGw27qkgdY1XocAtSxViPzfNWpjYVy/4tEbAdFRz9KztqrZj J16g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=uFmJ94vgdYtHsEMf0/KuGJB8O++/BC7ohIyt5Fgn7pI=; b=dBwWank8BlUCnxGKP/esSdzSWaR50RG0NXVdtGEPMYTdNxEqacCOT9YhXbSc7lNNQY 1wqH8xUXFaYeblx7OgqqJDg3goUYQyxz6Ll3IWwTS1fCYPys/Lrk23xFdgj/pcOgQ4sT zds4yLKyvgF2Wx2iSy28E7UzCao+YU+3bjv/bh+VjQCJAeLTiOS74Ii1cYjGEXFdYWnt bbUglcefaBYhZuShGOeA6SBYLskgNBaFzwqrnYBrMAMjOp1TJ9OvV3IznF4rjd9mTSWS 8VAgj1cjU0foPKrWu1updUg0BrNiVrQn4O2CTvzdgX6aB3bn21ycdSpMIWHSK+WwFPVR JTpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ElgK4ZOa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q10-20020a170902eb8a00b0018863dbf3b1si3952995plg.284.2022.12.23.10.41.18; Fri, 23 Dec 2022 10:41:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ElgK4ZOa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231295AbiLWS2y (ORCPT <rfc822;pacteraone@gmail.com> + 99 others); Fri, 23 Dec 2022 13:28:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231276AbiLWS2w (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 23 Dec 2022 13:28:52 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 932BF1EEE6 for <linux-kernel@vger.kernel.org>; Fri, 23 Dec 2022 10:28:51 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id o31-20020a17090a0a2200b00223fedffb30so5647614pjo.3 for <linux-kernel@vger.kernel.org>; Fri, 23 Dec 2022 10:28:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=uFmJ94vgdYtHsEMf0/KuGJB8O++/BC7ohIyt5Fgn7pI=; b=ElgK4ZOatixFeDSXHWG1Ja36Gaa/aRySfgH6IWbKvHwrt+qWRmB8Q0V6Axbh6WUnIS 95A/hEHYA64Jr/hlfVkIc/NbGXmDDT1rwsY2QZorZnE25auressDUTSkJCD91hYmSBgT 3B58T79yKrzeMcWOjAtdRIiMm1gQfdBnlNI20= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uFmJ94vgdYtHsEMf0/KuGJB8O++/BC7ohIyt5Fgn7pI=; b=AoblCxMjadSdiPQ8+YVJD1DGNSPJaST6Pqt+h/MDwdp5e55VBxFDESBslo+/jdFHIZ er7fhnqDVzcg0/smxoamwQpRZnn/pprKJczNux9P93W60dB2heCKlcPedWGC0feLmNrS lDLbLPn+iJwcQiVlOJgJMySmw/by2CkANPC7UNVwHOzttJx9Yj6Z7cK7hCZwIPI/KIkr m2C1C4OEUw0wkh9KKstD0KbGKnOENN94mhHsJCBOC+mK8UkMJrlF+LQhu/jAPG/LZR+L AxFBl1NL3LLEdNwFm7VZgcypy4fKrY6DAX+S/2RkDHaqKiN9AWbIxfQ0CFehUhs914v9 KIDQ== X-Gm-Message-State: AFqh2kr2iptkdD5ej7mNQqS1RNKcGwFThtJeuT1Sdnw3edr8F5L7bXcS jk2xgwQsOPA5Wxsz9ALgaNLLmA== X-Received: by 2002:a17:903:328e:b0:191:191f:e7af with SMTP id jh14-20020a170903328e00b00191191fe7afmr11434481plb.16.1671820130175; Fri, 23 Dec 2022 10:28:50 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id z5-20020a1709027e8500b00189c62eac37sm2727890pla.32.2022.12.23.10.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Dec 2022 10:28:49 -0800 (PST) From: Kees Cook <keescook@chromium.org> To: Alexei Starovoitov <ast@kernel.org> Cc: Kees Cook <keescook@chromium.org>, Hyunwoo Kim <v4bel@theori.io>, Daniel Borkmann <daniel@iogearbox.net>, John Fastabend <john.fastabend@gmail.com>, Andrii Nakryiko <andrii@kernel.org>, Martin KaFai Lau <martin.lau@linux.dev>, Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>, KP Singh <kpsingh@kernel.org>, Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>, bpf@vger.kernel.org, syzbot+b1e1f7feb407b56d0355@syzkaller.appspotmail.com, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] bpf: Always use maximal size for copy_array() Date: Fri, 23 Dec 2022 10:28:44 -0800 Message-Id: <20221223182836.never.866-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2069; h=from:subject:message-id; bh=t1OBGhUbcR8nf2++QuxM7FqpZ9UFkmqZvOnliSZEUTE=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBjpfNcsRz8afKnm1B38atDy/LxrBm3b4UZpSVoEyiC oYseHr6JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCY6XzXAAKCRCJcvTf3G3AJkA0EA CQvcv59+py3Ot0bfishkg0yCD3rI/T6QxpeFBbXklzHVSMjI++zbfBaTXo91O4rwjrC2NoDxEPY0xx D5mr5lj2NDFwNMvff8tSRJyH7COrX9W7wMoHR38Bhp4klOmbWWIeLjL8weeD7vm+17jmOP/PtTo/wM ++vHN/270KNs9+XfDR81LRnRze89Oir88FBWTtQDVmyz1t/ILTosrmkczJ/WhTKOZD8epirnm883Id Ixer5RmOPNpZCNu8H0KM32WKmyClUDMdy5JBIAqCPd8mjWY0ke9b6zhExgu9z6oBLelR/WFkmAs45w ThqMBox1hgSWHHZPD3lPfbaLIdaR5YwO7VHlKdCzgnnt1Vp6KeuoDuOSHoiXpauzS2tB/NW41p+h6M 8C6fFzPZfF8sgLwXRpoOasVGgrdCCZAGd7TE3wS3KcPh7BlM9UI7Yr6O6I8gik9sQCvhis1jsxUmHD Pysboz4zLQPLmA9dhBFWLCBfUpQ8AWk8ytREuiNrPrX1mLI3vKrFGCY12vF0MPvg0h8RWG00+dOwrP XBcasg0ir+Jd3pdQDUwS3AW+t2/WFyJH6Id5UvAJX9t/GzhMYFTAhT+Z8W7AuUI3mhn8Qgih8/6n5l zLTvUzzDuG3+3qhaytMOM265N8GDR2JIsH3tXcSa7B6I0XzQ2+PqoOki0lMQ== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753031262381211413?= X-GMAIL-MSGID: =?utf-8?q?1753031262381211413?= |
Series |
bpf: Always use maximal size for copy_array()
|
|
Commit Message
Kees Cook
Dec. 23, 2022, 6:28 p.m. UTC
Instead of counting on prior allocations to have sized allocations to
the next kmalloc bucket size, always perform a krealloc that is at least
ksize(dst) in size (which is a no-op), so the size can be correctly
tracked by all the various allocation size trackers (KASAN,
__alloc_size, etc).
Reported-by: Hyunwoo Kim <v4bel@theori.io>
Link: https://lore.kernel.org/bpf/20221223094551.GA1439509@ubuntu
Fixes: ceb35b666d42 ("bpf/verifier: Use kmalloc_size_roundup() to match ksize() usage")
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Martin KaFai Lau <martin.lau@linux.dev>
Cc: Song Liu <song@kernel.org>
Cc: Yonghong Song <yhs@fb.com>
Cc: KP Singh <kpsingh@kernel.org>
Cc: Stanislav Fomichev <sdf@google.com>
Cc: Hao Luo <haoluo@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: bpf@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
kernel/bpf/verifier.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
Comments
Hello: This patch was applied to bpf/bpf.git (master) by Alexei Starovoitov <ast@kernel.org>: On Fri, 23 Dec 2022 10:28:44 -0800 you wrote: > Instead of counting on prior allocations to have sized allocations to > the next kmalloc bucket size, always perform a krealloc that is at least > ksize(dst) in size (which is a no-op), so the size can be correctly > tracked by all the various allocation size trackers (KASAN, > __alloc_size, etc). > > Reported-by: Hyunwoo Kim <v4bel@theori.io> > Link: https://lore.kernel.org/bpf/20221223094551.GA1439509@ubuntu > Fixes: ceb35b666d42 ("bpf/verifier: Use kmalloc_size_roundup() to match ksize() usage") > Cc: Alexei Starovoitov <ast@kernel.org> > Cc: Daniel Borkmann <daniel@iogearbox.net> > Cc: John Fastabend <john.fastabend@gmail.com> > Cc: Andrii Nakryiko <andrii@kernel.org> > Cc: Martin KaFai Lau <martin.lau@linux.dev> > Cc: Song Liu <song@kernel.org> > Cc: Yonghong Song <yhs@fb.com> > Cc: KP Singh <kpsingh@kernel.org> > Cc: Stanislav Fomichev <sdf@google.com> > Cc: Hao Luo <haoluo@google.com> > Cc: Jiri Olsa <jolsa@kernel.org> > Cc: bpf@vger.kernel.org > Signed-off-by: Kees Cook <keescook@chromium.org> > > [...] Here is the summary with links: - bpf: Always use maximal size for copy_array() https://git.kernel.org/bpf/bpf/c/45435d8da71f You are awesome, thank you!
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index a5255a0dcbb6..969e61bd6d39 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -1054,6 +1054,8 @@ static void print_insn_state(struct bpf_verifier_env *env, */ static void *copy_array(void *dst, const void *src, size_t n, size_t size, gfp_t flags) { + size_t alloc_bytes; + void *orig = dst; size_t bytes; if (ZERO_OR_NULL_PTR(src)) @@ -1062,11 +1064,11 @@ static void *copy_array(void *dst, const void *src, size_t n, size_t size, gfp_t if (unlikely(check_mul_overflow(n, size, &bytes))) return NULL; - if (ksize(dst) < ksize(src)) { - kfree(dst); - dst = kmalloc_track_caller(kmalloc_size_roundup(bytes), flags); - if (!dst) - return NULL; + alloc_bytes = max(ksize(orig), kmalloc_size_roundup(bytes)); + dst = krealloc(orig, alloc_bytes, flags); + if (!dst) { + kfree(orig); + return NULL; } memcpy(dst, src, bytes);