From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0BB343D667D for ; Tue, 30 Jun 2026 16:47:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782838028; cv=none; b=KVbJJ8kB5TxxwezRynXf9aH8jd5K0WhNVMQYoRCTmcK2aijLH3ByI1UuBoDZL9iodWuimPnHoGx1Z921jXSAguB5Hsom2zLWzhkeItOIdG7UN0GKtkq3NHwcddYzQiJV9rXP0ij1cxfE9HIP+5l7t2w+gs0npCh2D5WP6b20swA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782838028; c=relaxed/simple; bh=rmXCZFpKxJzazxmjn8bzq96ps74DVqbvt62SKSYliVE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LbCxy0w1dgspyesGzII7VoFhNyt7Tk/nc8xOU+1mPIz+UIdeAduvQqFd4JDbeF4S5JjcZGWIz69oP9UZtuIOg8UzLBDa2hrhHWFNkW52Fsm3LY1rndP1e+d7SPNQqDYsISu62Dc+MYWxA1eWQ1PYqt+6ofpng6AnbgeNDIo4M48= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=GPzM3gcn; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=VsZjcXlq; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GPzM3gcn"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="VsZjcXlq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782838026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xiOPZVlIWXYiaqpOQmyOxWG5vDCdJG1lOjq1LsrNa5o=; b=GPzM3gcnt+YnVT/X7mqj5se926Td8ltNFkYhBI2uTlZvWjMvdqLa+ziADrzno7dknQnMmn kZkBVw95OVWkPVYtrou1pS9b2yknUmhSd2M1AiwtZaDGyK7XNLczTRrAnAHZFhYZyNCrc2 qukxMtb2AZ+Wda+anN1OHCV75p2Qt3A= Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-224-prLodd1HOzmAzDgXGs64kQ-1; Tue, 30 Jun 2026 12:47:04 -0400 X-MC-Unique: prLodd1HOzmAzDgXGs64kQ-1 X-Mimecast-MFC-AGG-ID: prLodd1HOzmAzDgXGs64kQ_1782838023 Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-845e3ede1f9so2362950b3a.0 for ; Tue, 30 Jun 2026 09:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1782838023; x=1783442823; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xiOPZVlIWXYiaqpOQmyOxWG5vDCdJG1lOjq1LsrNa5o=; b=VsZjcXlqCcjXoIe10ZpdDfp6Yui8Fhw6oTXgUZapYMULjzdl5CJ3E7povb2zv5ZscP k0uT+EztKLZLE/Du4UtXRN0dJS/m3ASwny3u2xzkT2Bq5vAc6hjtHz8mDn3iVtbyacfD +G+JrMfpleTKRFrkPfelK0Mx+GGoocwlZsY8O1AXwK+EgKDnn2yzuGoiogwSxFS/LQFL 746qgmsd8upwRraSoMg6GCNrCLVcvzcHz6qMkVO+AiHomiQY+YMTzva+w7ym4LO2O+PC SyVQpz4PPVcmMoFHvktU7V07tHhPiCkJFbjvtjjyPjOcdoH1lZMk9K9zm3Xe5gplzLdP rdOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782838023; x=1783442823; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xiOPZVlIWXYiaqpOQmyOxWG5vDCdJG1lOjq1LsrNa5o=; b=OYQs9pjZfESmGlstJcTaX35rQ2QrUunvsi41R6u3bKJeGMkHYoq2gQUeSrH34giPAZ IbHgTqEnLtMkhsomxwmlPFW0Op6oP0b0xWC40uH6ydk5CnIIlcMJwscbw5EtzOF+BOLe 29oEwAp+AMl/oYuPrNv2zu/oNUa8mHqMGagbkzTIL12SJs1NFZgSqJ4RmhCjS5gqBA9L p54+vYKVItXTZYf6pTU92vESGH7cB2YMrwpbS7PLmXeQp06bPTENuX7EAf0tOMLlFHz/ c+FdkPMlOPyekb602dRxIJgO+1t7xAtjGv6MG3sFZpi2U1DgnMu91tPJFYxSggJUt7DH ppew== X-Forwarded-Encrypted: i=1; AHgh+Ro55DW7AoSnLJ9YTFdGb24moPPEuShwImdcl5KlpMGnV5gwE8FWzCeC3jpS8+r0Y9jgFpSY2YcOSIAu0o8=@vger.kernel.org X-Gm-Message-State: AOJu0Yxynh6fN9bOZzOluZQr0JKwjWLPkh8wE7bj/NhYy8F57zUIypf4 BcTwMXbxhYFCEBp9eQu7OYLqBFDNVt/iR5EYQwZvQ6jX2/BXoC1H7fiBiALXXjnZjuUXeAZqnyY 4Yx9jzvUfZQXSvgeh/+9JZtD32G7I+c/X9B1CVS//NaMrRoT+9uxb2Crxe8NtfQLHIw== X-Gm-Gg: AfdE7cmK9B9AkDCIO8Ng7PGUOruEij6JpjH9rP/inEGAGW2s9RYvcuy/k3YfSsFAB8I 3hDEM8Kg7+hpzKb+aDMeW4UC1nJZVvPPVidj1vKXigLKuPqLid1TTokTYSxK+suaiutsIU9gRgn D3dnXfmtOiFCVMvrLc/QPH3SX4/S9ORCnM+/kTl2OStaDb9J0zQbPoHLR6+oK0ZWfhxRiHtvpgj 2PjgZKilplAxB9Q7TgxIMMK3ZSfTh39wEZ3+2OV4r37rjEIPfosf83yXqo32owcCi/DyXEVgZB/ NQP0+kAGXzHlwcm9pyqAV858x0pcfXwcSn7s8QjqZeat6TqhBELiSemcYNMoxIm4366AvpQB45q CeYcIDf8TnPwAdbll6MZfBZ1I/Y73KWSBmps= X-Received: by 2002:a05:6a00:92a5:b0:847:8337:64e4 with SMTP id d2e1a72fcca58-8479f1f553amr3419024b3a.30.1782838023347; Tue, 30 Jun 2026 09:47:03 -0700 (PDT) X-Received: by 2002:a05:6a00:92a5:b0:847:8337:64e4 with SMTP id d2e1a72fcca58-8479f1f553amr3418980b3a.30.1782838022460; Tue, 30 Jun 2026 09:47:02 -0700 (PDT) Received: from kernel-devel.tail62cea.ts.net ([240d:1a:c0d:9f00:be24:11ff:fe35:71b3]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a03b9ffasm2378390b3a.59.2026.06.30.09.47.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 09:47:01 -0700 (PDT) From: Shigeru Yoshida To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matvey Kovalev , Shigeru Yoshida , Pavel Zhigulin , Jamie Bainbridge Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net] qede: fix off-by-one in BD ring consumption on build_skb failure Date: Wed, 1 Jul 2026 01:46:20 +0900 Message-ID: <20260630164623.3152625-1-syoshida@redhat.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit qede_rx_build_skb() and qede_tpa_rx_build_skb() do not check for a NULL return from qede_build_skb(). When it returns NULL under memory pressure, the functions still consume a BD from the ring before returning NULL. The callers then recycle additional BDs, resulting in one extra BD being consumed (off-by-one). This desynchronizes the BD ring, which can corrupt DMA page reference counts and lead to SLUB freelist corruption. Commit 4e910dbe3650 ("qede: confirm skb is allocated before using") added a NULL check inside qede_build_skb() to prevent a NULL pointer dereference, but did not address the missing NULL checks in the callers, making this off-by-one reachable. Fix this by adding NULL checks for the return value of qede_build_skb() in both qede_rx_build_skb() and qede_tpa_rx_build_skb(), returning NULL immediately before any BD ring manipulation. Fixes: 4e910dbe3650 ("qede: confirm skb is allocated before using") Signed-off-by: Shigeru Yoshida --- drivers/net/ethernet/qlogic/qede/qede_fp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c b/drivers/net/ethernet/qlogic/qede/qede_fp.c index 33e18bb69774..c11e0d8f98aa 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_fp.c +++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c @@ -765,6 +765,9 @@ qede_tpa_rx_build_skb(struct qede_dev *edev, struct sk_buff *skb; skb = qede_build_skb(rxq, bd, len, pad); + if (unlikely(!skb)) + return NULL; + bd->page_offset += rxq->rx_buf_seg_size; if (bd->page_offset == PAGE_SIZE) { @@ -812,6 +815,8 @@ qede_rx_build_skb(struct qede_dev *edev, } skb = qede_build_skb(rxq, bd, len, pad); + if (unlikely(!skb)) + return NULL; if (unlikely(qede_realloc_rx_buffer(rxq, bd))) { /* Incr page ref count to reuse on allocation failure so -- 2.54.0