From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (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 515CA35E1D5 for ; Fri, 14 Aug 2026 23:49:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786751363; cv=none; b=BvfwkgGacDDw5mNEx0pkC1puYoe2uy+mndvOBrdzefMLe9bcgvSEg8fO9YIcNuVCGmLkaDafLlyZ+BeUFK5y+kM2eUkZq6W/1eu6whYAPGbKNzcdwwK7MXmHuWW2U6KB5mGphsbxJ1/i17Nt1Yu/wkR/Ttxf8XVLwiV/VVbK/hA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786751363; c=relaxed/simple; bh=i5raLJ/viRB4jfYcj0wFvVQznmGjwyiH+SUbX8pRp8k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=G+9L7Axeb3riJpEtMYE66IrP6vqJBArGS1BeGN7DVRfZuDHvK9kZaYkxmTM7ouUwmqAd7bn6GWSv5AlKgzQRBA6//gKGpD2AaCU3fTlbsJ/imdY16tgxCgXMZ/8+FvkzayvsFbD3G7oZxGf2n7zPJqnHqXbe0g94UVMd4JatAgs= 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=p6mrx4fn; arc=none smtp.client-ip=209.85.214.199 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="p6mrx4fn" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2d001671a54so31666435ad.2 for ; Fri, 14 Aug 2026 16:49:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786751358; x=1787356158; 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=7djAafJOLBuE+bXbQTtDxXCPhwnYez80KiMRMTkFHt4=; b=p6mrx4fnHojiNdphcYhOL1pN3SK3a2BR+qXr+ynr9+jIS+E/5Lhp1IVi67MNm2AzE+ unPSkS+O5JbFV536ggTX0fFNDsceiaGM57CD8+qsH3BOitfPPHzF/zIS+Oe//JKWHYGZ tgIlS8aRhAx6D+1+PmIE+pj/+mG+hyOawuWRkXlQTjCcTbeR7JwzmfNBGN5oemaKp8nB FFArPu+nCYHZ4i9ZbOkgdawHVtfcCf22yiTjd1zU+EitSAQrY23TEpJ+cTiiuXjkkFZO SnoTLO29VqgWx0v4Y8oPSQeG4s8bG93En7UdgwssXSg1wsvQqZ5s9UZ+n5u/h/Tw/7JS dqkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786751358; x=1787356158; 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=7djAafJOLBuE+bXbQTtDxXCPhwnYez80KiMRMTkFHt4=; b=nCP6mlVebU3SQEoNROc6iqFmhEcZe35L27TN7icVamre9N1G6t0otAMqPbVdZwOfmT Rm0xGAz8Th+H2lD5tbe3AMJ4tsvomP3RvfoMLn4os/8DVN3QpQF5N+uAvQ5ev6oRZL4x q6B78nrexaUc6sjzZzZaRqqqyUekagwmIzYpT2Yz1MNmJzePByN5/9wnFrpUuIS7WP/u 0mzwaVush9FgNOsFGuSs7q07dGGAWGoQxkmjnImsWMEZcI1R9AZnRfkvfgPV7qnJj06v EKw+tZ39D/cgG8n0YBfw4qJzH03dBOGnDFkB65vJkHZNo+GsEn+OW+3AhRUeOgyGlxSd C40A== X-Forwarded-Encrypted: i=1; AHgh+RrXIivN/AAu3QseQT1dCsSZ0joV/wlgOJiO6QZvnOIHuDL8S2xzcmyrtkvxYA6jmkmbOUpsvSOvjkT0S04=@vger.kernel.org X-Gm-Message-State: AOJu0YxJBOksTuJ4QlLY6ahYj+DI23ICXiIWZVZ60+BE7ThGZb1G7xUI P4wQZFb1e71vcL5OJl0ngQ3jlvSbO9IMpKiUfo7/HmKpYPzghfmQdr//+0szf+K4FXoN5QdhQG1 HOpAWvptoJcaYTg== X-Received: from plnt11.prod.google.com ([2002:a17:903:196b:b0:2c9:a5a0:a677]) (user=joshwash job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f689:b0:2c9:fa31:84f9 with SMTP id d9443c01a7336-2d3b0cdc256mr101631195ad.5.1786751357477; Fri, 14 Aug 2026 16:49:17 -0700 (PDT) Date: Fri, 14 Aug 2026 16:48:42 -0700 In-Reply-To: <20260814234845.773189-1-joshwash@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260814234845.773189-1-joshwash@google.com> X-Mailer: git-send-email 2.55.0.691.gc56d675ccc-goog Message-ID: <20260814234845.773189-4-joshwash@google.com> Subject: [PATCH net 3/6] 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 , Jordan Rhee , Willem de Bruijn , Ankit Garg , Tim Hostetler , Praveen Kaligineedi , Jeroen de Borst , Stanislav Fomichev , 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 2c1ce23d1550..811db42d05c6 100644 --- a/drivers/net/ethernet/google/gve/gve_rx_dqo.c +++ b/drivers/net/ethernet/google/gve/gve_rx_dqo.c @@ -845,7 +845,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.691.gc56d675ccc-goog