From patchwork Tue Jul 6 16:31:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 470723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8899BC07E9B for ; Tue, 6 Jul 2021 16:32:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6DDF061C30 for ; Tue, 6 Jul 2021 16:32:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230180AbhGFQek (ORCPT ); Tue, 6 Jul 2021 12:34:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229935AbhGFQeg (ORCPT ); Tue, 6 Jul 2021 12:34:36 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43EDBC061574; Tue, 6 Jul 2021 09:31:58 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id g22so21912262pgl.7; Tue, 06 Jul 2021 09:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UnYYMxswpqXM+KQP7uAH2N/4AI0cHpLeFX2DLye7kKI=; b=i1HFNdlPloI5NUyFVYC4SHN5HeSKlh+oTx74ZdP3yU0dJ90O1YIe46SYxW25EapNk8 my3v0/pXWNXeEEkP/XbtFx7Rg8q0Q6WxFyexMyIA8efHZgoITT9Fwh+URH5w3iuu0hkY fvwufcwvLA8bXzOmY+DpGkHoAJyBiKNR7k4tlqkgw7LDARgYdGxsIjGIRus1MGSkHeFy fNT+15FGTd1vB+rTtL+YJYGWtoIdSp3ZjIyvZBM0hd6pJAjNAgvKQB97Hs8se6KxIkQr 0TtKDr/l73gtprYEHCn3mPJZXMW24co+QgkrEedmzhgdez2GS0ACxbAjxlZ/kFSF9hhi s08Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UnYYMxswpqXM+KQP7uAH2N/4AI0cHpLeFX2DLye7kKI=; b=Obs85gXqssn63piNVUWZ9lOl3SR5o/6yfsd84HjqFC/F91UqN8Dm5KxOyg8/By/z7u dzO1JV5N5qmsePcDtinCgzJk/3G2cnXr+lVZfytaD6f9ker4nyJJjnJxTTQi5zx/fU+S hpXzIPrs9l/svCEAW8oKTRaheC2lVrzmriz9OJ31xe41kuWY+zfi9Q/KM7jKrh346JgC gD2fC/SbuZuAY7RKmYU5CU4+uE9lcFbKmxEvcENTqj7sNuTKLW8B60hCIup8q3eHE7n5 4LrMd5U4DUexxvj2+sfAZVDYd59F1dTnsVrX3G8o9vERANm/OLg7YMmZ5jKK5DJxvwTp wrsA== X-Gm-Message-State: AOAM532xfcScu2pEqjZMId179yWBR75MPiKA1kpN9V3viqULON6XfzhT 93HIESVev2pe+tot/hxcmHg= X-Google-Smtp-Source: ABdhPJzLMUdY2BhrQYVjcrZ4nH1mTK/tcJH/B6AUZOJQ6Uip7TkUEorkd8wgxfuLYynAzFakJ/sIhw== X-Received: by 2002:a65:57cb:: with SMTP id q11mr21613462pgr.430.1625589117531; Tue, 06 Jul 2021 09:31:57 -0700 (PDT) Received: from localhost.localdomain (51.sub-174-204-201.myvzw.com. [174.204.201.51]) by smtp.gmail.com with ESMTPSA id b4sm14942570pji.52.2021.07.06.09.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 09:31:57 -0700 (PDT) From: John Fastabend To: ast@kernel.org, daniel@iogearbox.net, andriin@fb.com, xiyou.wangcong@gmail.com Cc: john.fastabend@gmail.com, bpf@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH bpf v3 1/2] bpf, sockmap: fix potential memory leak on unlikely error case Date: Tue, 6 Jul 2021 09:31:49 -0700 Message-Id: <20210706163150.112591-2-john.fastabend@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210706163150.112591-1-john.fastabend@gmail.com> References: <20210706163150.112591-1-john.fastabend@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If skb_linearize is needed and fails we could leak a msg on the error handling. To fix ensure we kfree the msg block before returning error. Found during code review. Fixes: 4363023d2668e ("bpf, sockmap: Avoid failures from skb_to_sgvec when skb has frag_list") Signed-off-by: John Fastabend --- net/core/skmsg.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 9b6160a191f8..1a9059e5b3b3 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -508,10 +508,8 @@ static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb, if (skb_linearize(skb)) return -EAGAIN; num_sge = skb_to_sgvec(skb, msg->sg.data, 0, skb->len); - if (unlikely(num_sge < 0)) { - kfree(msg); + if (unlikely(num_sge < 0)) return num_sge; - } copied = skb->len; msg->sg.start = 0; @@ -530,6 +528,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb) { struct sock *sk = psock->sk; struct sk_msg *msg; + int err; /* If we are receiving on the same sock skb->sk is already assigned, * skip memory accounting and owner transition seeing it already set @@ -548,7 +547,10 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb) * into user buffers. */ skb_set_owner_r(skb, sk); - return sk_psock_skb_ingress_enqueue(skb, psock, sk, msg); + err = sk_psock_skb_ingress_enqueue(skb, psock, sk, msg); + if (err < 0) + kfree(msg); + return err; } /* Puts an skb on the ingress queue of the socket already assigned to the From patchwork Tue Jul 6 16:31:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 471180 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2000CC07E9E for ; Tue, 6 Jul 2021 16:32:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0CC0461C29 for ; Tue, 6 Jul 2021 16:32:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230107AbhGFQel (ORCPT ); Tue, 6 Jul 2021 12:34:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230129AbhGFQei (ORCPT ); Tue, 6 Jul 2021 12:34:38 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94CDEC06175F; Tue, 6 Jul 2021 09:31:59 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id q10so3762845pfj.12; Tue, 06 Jul 2021 09:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=87DPVRnOYK2PwLLhI2+qCBcidS77vkWMsF0VtVTxOuc=; b=DM4LQvZivFRrawA7QI05xB6Tib3mVYjGnHZHoqId0bTHt9Tvs4ISvNDb4px0JHIqFn sbTiO3LeRwReKAIvQ1lVpsG9KdkUESM1N6vHk8CXWYvzviwQkPE+q1xsvw0x7QX9VL8p sg7f/S0mxmfCndthQYmdzKvb4m8hn1fmwKfqSUnRuIiSu2ufXzuXL7Ro27TtDUL2vIe2 kx/YWDGeAswViiE1MExq4ghyBi4Tj3pl/SmH5IdDRyKQtgJv0hHPG0EnsfYWv4p9kXmZ O3LoOKzzXN7yDUmfux9ZdHBQRHHCCphFrI8pBnwAbErafvV0KzSTx6rcxXRPFCOr+vn6 1keQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=87DPVRnOYK2PwLLhI2+qCBcidS77vkWMsF0VtVTxOuc=; b=XTiKHWe/ZZ38Bxr2McbKOlVqIprWZA9XeYXzMz0WpY0gl82OqwalMSiE8WH4NAf1/R C8SzZbE61uG1Tvbq4oj99BCt2yPidAMUS24A/gAWcc3PxjnKnYWBmgpvlvlATiqmGGSM EKfw2ZwmPBc84LNe1Ad73c3b0KttdNoYFS87d1pLptEsjZc0hAMR181KgbUS1BHlCv+0 lmRiK2DfYgnC9uPUTWjdTaIsukfTXv8yBVvGQXUms3UNiqmd7jwDVnYNDqyRzXzf7tIZ UgJxzwSbboy1NIP0WYiew52+lRdK/PIm4s09nXAo6ZilMnb0OZ+pF42QKt9LWrjgiP+T 2TaA== X-Gm-Message-State: AOAM531mrrhUtdnjq2q7OnnZcljgvtjiBBCNaltZ23auYI7CUKW5GX6P eavA2crU/EOXHYDJJDWo0Sk= X-Google-Smtp-Source: ABdhPJxQJvAp6+F7sEgZcsWfRLI7194NY4C606/+mt39uOlPFBY3NrTTGUla2utMMyPr0jcF4WPJjg== X-Received: by 2002:a63:5059:: with SMTP id q25mr11364969pgl.9.1625589119174; Tue, 06 Jul 2021 09:31:59 -0700 (PDT) Received: from localhost.localdomain (51.sub-174-204-201.myvzw.com. [174.204.201.51]) by smtp.gmail.com with ESMTPSA id b4sm14942570pji.52.2021.07.06.09.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 09:31:58 -0700 (PDT) From: John Fastabend To: ast@kernel.org, daniel@iogearbox.net, andriin@fb.com, xiyou.wangcong@gmail.com Cc: john.fastabend@gmail.com, bpf@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH bpf v3 2/2] bpf, sockmap: sk_prot needs inuse_idx set for proc stats Date: Tue, 6 Jul 2021 09:31:50 -0700 Message-Id: <20210706163150.112591-3-john.fastabend@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210706163150.112591-1-john.fastabend@gmail.com> References: <20210706163150.112591-1-john.fastabend@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Proc socket stats use sk_prot->inuse_idx value to record inuse sock stats. We currently do not set this correctly from sockmap side. The result is reading sock stats '/proc/net/sockstat' gives incorrect values. The socket counter is incremented correctly, but because we don't set the counter correctly when we replace sk_prot we may omit the decrement. Fixes: 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface") Signed-off-by: John Fastabend --- net/core/sock_map.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/net/core/sock_map.c b/net/core/sock_map.c index 60decd6420ca..27bdf768aa8c 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -185,10 +185,19 @@ static void sock_map_unref(struct sock *sk, void *link_raw) static int sock_map_init_proto(struct sock *sk, struct sk_psock *psock) { + int err; +#ifdef CONFIG_PROC_FS + int idx = sk->sk_prot->inuse_idx; +#endif if (!sk->sk_prot->psock_update_sk_prot) return -EINVAL; psock->psock_update_sk_prot = sk->sk_prot->psock_update_sk_prot; - return sk->sk_prot->psock_update_sk_prot(sk, psock, false); + err = sk->sk_prot->psock_update_sk_prot(sk, psock, false); +#ifdef CONFIG_PROC_FS + if (!err) + sk->sk_prot->inuse_idx = idx; +#endif + return err; } static struct sk_psock *sock_map_psock_get_checked(struct sock *sk)