From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0AAE37DEBF for ; Tue, 22 Sep 2026 19:45:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.198 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790106350; cv=none; b=rkXAUryXKFQ8toE0bCOlI6Zaualqqw4nOO4hHPJ6TCb/4q6QBttvq5AZx3eKDZE2lx8u61KRE/6D/97TrJl7T2eHygXGFofnJYnK+hlDKFRJaGho3Zqa5ug+TxNjqfg00BTX18nhAIbmQ+StGfmdhAsVX77B/ROGIgoNiD/WpFE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790106350; c=relaxed/simple; bh=phK9UGM82Su0/Yft5H1gsYRLHi1zGw1yM7fKl/AmyEw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=aHqlPMsoJDxg3vFIfmEAt6Z7WWT8wHVuGq/oQGLQLtSsAyNKyrt+klOgxUrSB3v2bvWrZPTu/mAR7o2L3Fa80JhAMxHgxc20e2FjbxLTxiNhAm/dXCrAzob56ibMF3LUVAoDk7RTWYOUUXlFCXKj1hDUYWDQrmqi2+i0bEHGOiY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--joshwash.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=gXCwaLJK; arc=none smtp.client-ip=209.85.215.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--joshwash.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gXCwaLJK" Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-cc42a07d04aso197370a12.1 for ; Tue, 22 Sep 2026 12:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790106344; x=1790711144; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=EcTqMP1GOUb8ln7imudpJQ6C9nwPlePs3BJaEQbnd4o=; b=gXCwaLJKDI0BJ/rH10BhZzCHomuw0AG71/rrOZ8UJk1OwYuBq8Fm/JcFvEIE88LYDn LN/rYMycTfW4U9X1UF0+amzqlpgifPto6qSF1NXiLOsGn1gt1UgIDZT/3WqBG0l6nUoB A9LkVT/m0ayb/llsObTBluxWuckZwpm/i/oBkqdnuSIXeEpBrxRJIrueRUAgh2CVpHCB 1dIz+gpMIuAxvmvYsixt2oAzhsQCGjOlR8S7iqMwYIUl1tu68BRLZBIg3hDZsozPhTuH tOlaA2Kj8lR7UjqDa5kFNmKic/XV4POFIdMDrSlZRv1oWvjOmAvLh96CCZUKD5Ou9AQR mX+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790106344; x=1790711144; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EcTqMP1GOUb8ln7imudpJQ6C9nwPlePs3BJaEQbnd4o=; b=UqU9A9OjYXmYi8i83kZtAIWwKeogDyRkwvr4SnoEBrOs0p7THUNPohY0AAS+LtjCWe FfCzw826n2Ty6TXi1fo3UHrRgx2eJWiGiJhewmZee0B/uLKvBOPvvyNOuSis7f0cywrx /3K1NXs5nhtH4nmUcQuSJZ8G9a8RbVuJ8+d1lkulDYwPGUHlo+yAvP2cq7cMq1nrA3Y7 zYpY+mE2PcpKYsCLUCAFOHkvYJ0zMy/j/aIsLp7iVIssdilqLWSLSs5G9r80dyQEJGgc uF1kdDpo1tOel6jBeEJZ5N9FrHeICAHXlEdBc36zj6d3wIy0Y40Q1mnL37iHLWdooLlD n5dg== X-Gm-Message-State: AFuF++m7EuGa7BX2LKozKUf0eGaSwaWorf60NwuaCndeWaGrATPSIvOm pRjsIXaHKKzHThsGeJEZmr3JocsmF77Pbn+xVfup0ETENGkfH+aoj8n4hjEYywiFXat6NRuG565 +0jNBdTmXAyR5yaW6XnJYRj4fiaWsnG484wlAHfkYvzfvFhr2HuQb9/RIC0lU+P6ZY1Ig27cQhQ KHvTHUeKs+2zLc+6Rior0fH7iS+ODWzcsh0F6hSRusZo1yf+Y= X-Received: from pgvi12.prod.google.com ([2002:a65:61ac:0:b0:cc5:1183:79da]) (user=joshwash job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:8217:b0:3dd:a197:7359 with SMTP id adf61e73a8af0-3ddf8287ef8mr500782637.50.1790106343974; Tue, 22 Sep 2026 12:45:43 -0700 (PDT) Date: Tue, 22 Sep 2026 12:45:27 -0700 In-Reply-To: <20260922194533.631387-1-joshwash@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260922194533.631387-1-joshwash@google.com> X-Mailer: git-send-email 2.55.0.1082.g2b9226bbc0-goog Message-ID: <20260922194533.631387-4-joshwash@google.com> Subject: [PATCH net v2 3/9] gve: fix XSK buffer leak on error descriptor From: Joshua Washington To: netdev@vger.kernel.org Cc: Joshua Washington , Harshitha Ramamurthy , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Jordan Rhee , Willem de Bruijn , Tim Hostetler , Ankit Garg , Eddie Phillips , Praveen Kaligineedi , Jeroen de Borst , linux-kernel@vger.kernel.org, bpf@vger.kernel.org, stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" When the error bit is set in the RX completion descriptor, the buf_state and its attached buffer should be freed. In the case of AF_XDP ZC, the XSK buffer was not freed, leading to a leak. Fixes: c1fffc5d66a7 ("gve: implement DQO RX datapath and control path for AF_XDP zero-copy") Cc: stable@vger.kernel.org Reviewed-by: Jordan Rhee Reviewed-by: Tim Hostetler Signed-off-by: Joshua Washington --- drivers/net/ethernet/google/gve/gve_rx_dqo.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/google/gve/gve_rx_dqo.c b/drivers/net/ethernet/google/gve/gve_rx_dqo.c index 3a88b7e98b16..c1e97e11ff35 100644 --- a/drivers/net/ethernet/google/gve/gve_rx_dqo.c +++ b/drivers/net/ethernet/google/gve/gve_rx_dqo.c @@ -842,7 +842,12 @@ static int gve_rx_dqo(struct napi_struct *napi, struct gve_rx_ring *rx, } if (unlikely(compl_desc->rx_error)) { - gve_free_buffer(rx, buf_state); + if (buf_state->xsk_buff) { + xsk_buff_free(buf_state->xsk_buff); + gve_free_buf_state(rx, buf_state); + } else { + gve_free_buffer(rx, buf_state); + } return -EINVAL; } -- 2.55.0.1082.g2b9226bbc0-goog