From patchwork Tue Oct 18 09:25:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 4051 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1859570wrs; Tue, 18 Oct 2022 02:32:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7B8ghP+HQzRoD190/IKj3B4igKWTAUQT5lg7mbK1HxtW98OZd3FTkGcncw3NURGKj9Q4ml X-Received: by 2002:a17:906:cc0d:b0:78e:2c06:8e70 with SMTP id ml13-20020a170906cc0d00b0078e2c068e70mr1585497ejb.732.1666085532952; Tue, 18 Oct 2022 02:32:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666085532; cv=none; d=google.com; s=arc-20160816; b=dxxXe8lyLel4UY6F0X9NFgugjUSW8pGLWSG04fXExChKwymvglWoMVdN3Z9wWXwc0U HxlLOtQkNrjPhhv2rfUrrYB0hW5NopTVzYcwO6gRuDe8YwcAbjdVj/2m5SNc9573dEma d3ZAnzlfQ94YHj7wBNejb+nmPmawPPp0A6+Rxu3Z9EzG3kQHYuGnu25S/UPLXUMGFNla SeRzT4Aaf7SssJSML7U2luCcSBMtH2blXExSYM7HPf7W01u39phLjloRGDNHRROy9y40 8ZpLSDWrERv+XhOEzxxSXduvTQXbjMK/CAdBpL/pZktEMOCD7CPVhMhoCmjaMzhppxdy MfJA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/MUGpXXu/YLX6vB16EEikz0mUodhAtO8kh4qarh/vsQ=; b=ZuPC4lTT/9DmZ7BQw2oYj4LuX35SRUgnRVMN/LMLL02QfAyiavfFl2wTM3cNslkXM7 R1VwxaNq6xErs89xVWdtmgDfwBSqy8HaHlG3svuS2RmltAZUomWbYT8rvONm4BkfEpFk WodiOjEst1T3TYLfiPVnfw0JAtlwRfq7I81jrvV1sbqmfBjRFf8RNG413tocRDKmTLmq PctHpTE/kmGs59fEJ8NPofqQpvKbv/OI28n+osQKwzGQ4UJ1bYO01OzZEMk+fD4I50QP B3XrSZVn78/ZglSckQr72fi1G4XhAvXDHMsxSO1epPnX1Z5mHPXiGJY5hClGAfSq1UHZ yU2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=JtNmvf1u; 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 y11-20020a056402358b00b0045d22bc81a0si10961012edc.231.2022.10.18.02.31.48; Tue, 18 Oct 2022 02:32:12 -0700 (PDT) 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=JtNmvf1u; 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 S229756AbiJRJZ7 (ORCPT + 99 others); Tue, 18 Oct 2022 05:25:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229896AbiJRJZi (ORCPT ); Tue, 18 Oct 2022 05:25:38 -0400 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 400C91B9ED for ; Tue, 18 Oct 2022 02:25:29 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id g8-20020a17090a128800b0020c79f987ceso16753445pja.5 for ; Tue, 18 Oct 2022 02:25:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/MUGpXXu/YLX6vB16EEikz0mUodhAtO8kh4qarh/vsQ=; b=JtNmvf1ubSjiH1NO0qolmx2k/7lVy3Sznt8a8J8fM31erknTm2/E4tqjoxnBJwLEUi f3Ub/BNwRaIM6jgFHsYdDtJ86QHx2fNnwdn55tyNvD6wbcQXSG9/JRY/lQnc85sRdv8Z Ea4kYzXelL/Wlo0P6SmcA4mO/+bqaZgW1FYXE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/MUGpXXu/YLX6vB16EEikz0mUodhAtO8kh4qarh/vsQ=; b=WpikO2FOcpRSHmRPPGE79zr2FWcYkHv4K7j7ztJvME4u5sEMtkNd5jt5lgADg7K+Fk IQ6OLz+wLsWXWMFJIguMotPGLbg3hIeVnG//Yum9u4teTCAYYq4m/fcxuaBMI6LTX2nU X4amGZqUmtjZDJqTCPNP7EH4OJgZgB0uE9F410I67lBwai8QEA8F2oZW73in4d3Y/VX6 Zq0JjyPI+FohWKLPzLValJ88vWI/5OPbex1pxTgu+uXMENmXf81vw777icCUoAk3gBCv bKFIrHvb26LOCdYDhho8LZ5ec4fW19/hvMkM5ceqc5+5JzAZH7Q3IVD+rmg5iDhaznW2 1K8Q== X-Gm-Message-State: ACrzQf3qyd+IHPIZDnEG/nD/Vmpbj/9Ng57ac7XxFLlfgmxyzMKn7yaU UbkVv6Sz9kdFCGxqst78RrBonZknhK9GWg== X-Received: by 2002:a17:90b:350d:b0:20d:5438:f594 with SMTP id ls13-20020a17090b350d00b0020d5438f594mr38870290pjb.216.1666085128750; Tue, 18 Oct 2022 02:25:28 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id o125-20020a62cd83000000b00561c179e17dsm8694847pfg.76.2022.10.18.02.25.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 02:25:28 -0700 (PDT) From: Kees Cook To: Ruhl@www.outflux.net, Michael J Cc: Kees Cook , Jesse Brandeburg , Tony Nguyen , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH v3 1/2] igb: Do not free q_vector unless new one was allocated Date: Tue, 18 Oct 2022 02:25:24 -0700 Message-Id: <20221018092526.4035344-1-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221018092340.never.556-kees@kernel.org> References: <20221018092340.never.556-kees@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1396; h=from:subject; bh=R8ylvO6BqWbNVREdX/u1o3d4rMnlPe7DgQcXRdLK/uk=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBjTnEFGT/npSNQmG6Pg/wQsD1SJfFxPxu2rbyaqXID oCQB78+JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCY05xBQAKCRCJcvTf3G3AJi7vD/ 96KK47LIncnqzTUMut5a5skw4vihz4xnknY7/ue9t+x9mLj8qHg68Bwhsj1s6Ei3FnMALk3w768VYs SWUJUKa88nfLmMsRyuuiv/GTuK+tV2alLC3zKeeLtuPkJZIpyoNJwHOvRCJK8iOk6/dHj5XBXtOOr1 WEv8l8xFabrpKP3Pmf3DxpM4T3Fp/rmj8cCa8rnX6wvcH0nQwL5Jhtp7ZZ2wB9VuSRi1wg63+on06o HYBlb23VbUFT1uO4xKE0RlsmQlP/4y9JJmgScoRQkr1eQoIbL4uR4tX3ke8KTzviQUllgpIcN/HKHO 3EDeF9pKlGLcenyNmM9RDXH0dW1bLrNiAJ5f6yaaVWLx8MAooB4nY6dVUi9WiF2DJuZuEQenqPtlB6 StgzPvNXcrHnuhXvMO2GcNYO6VSfxhypAGYmHZKw6IQXOCzYF6yjVQW7Yji1kcmn1rk+aAC7rAetO5 NkxrAUM6cASntDrRuZK7kTOeOTuoHu8xS0XJttoDEy9dSJlLHNkMw7xIvR5ydp2oUpVfsCDGqKzyWm fhbrVNLgZtECKGDo1+eaDPoDYIskAVsjWf5kTjfLVOd+UrVNXtm9Kj4lolcvXjs38jYkx0OPzUy7mE x2lTxueP8LPPu50EdJIIy8Xy1olop7KKBYCeVB9wDl0PgbIz8gffRV7gFaUQ== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-2.4 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747017303770990604?= X-GMAIL-MSGID: =?utf-8?q?1747017303770990604?= Avoid potential use-after-free condition under memory pressure. If the kzalloc() fails, q_vector will be freed but left in the original adapter->q_vector[v_idx] array position. Cc: Jesse Brandeburg Cc: Tony Nguyen Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Michael J. Ruhl Tested-by: Gurucharan (A Contingent worker at Intel) --- drivers/net/ethernet/intel/igb/igb_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index f8e32833226c..6256855d0f62 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -1202,8 +1202,12 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, if (!q_vector) { q_vector = kzalloc(size, GFP_KERNEL); } else if (size > ksize(q_vector)) { - kfree_rcu(q_vector, rcu); - q_vector = kzalloc(size, GFP_KERNEL); + struct igb_q_vector *new_q_vector; + + new_q_vector = kzalloc(size, GFP_KERNEL); + if (new_q_vector) + kfree_rcu(q_vector, rcu); + q_vector = new_q_vector; } else { memset(q_vector, 0, size); }