From patchwork Tue Mar 4 23:49:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 14001638 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 C775A1FF1BF for ; Tue, 4 Mar 2025 23:49:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741132181; cv=none; b=Afv08oCp+Iy/eWA9zXfzSXumDIsx6O59kx455nytT4xwiyl52tlQotV6+Dc2xmAmEoQvTa4LpmnVIApkz8L7BuTevccba0Z19achEcAkanQO1/MTpAa/6CmfHjaaLG5ABLq+ZjnQLnpqvEG40I7oux/77Pr2i7Y3zx1s+wNhbHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741132181; c=relaxed/simple; bh=KGc5ZOpthDNGd1BsUds+xgHbJiLHtxGxIIOfKvP7wJk=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=Mx5fDF6ecPcq/vtYlr+6SAV5dD0k8/1s/oZ4UIbGYqqFzOeICe7Y0DNeb8LLy/E8QVhq3XV1ZVXgAmuDKsIfOIh5l7EhAkFP3wOZJ3OMEf8wQ7qVRsAQuBskFnQzcdF9dLhc+e6VLEmplYGrWTV6p70uDRUWpeFfgCP1Ug4qQw0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=OHGS+YbH; arc=none smtp.client-ip=209.85.216.73 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--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="OHGS+YbH" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fe8c5dbdb0so11938991a91.3 for ; Tue, 04 Mar 2025 15:49:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741132179; x=1741736979; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=+YMZiKSz5zNA/0UkYVvQA9DfWhT+3c5l8KwfO4x1oWs=; b=OHGS+YbHklFyjo2ZqSSi0Mksn52GfkpX6woVhcc/Svmpd+5J3NhSw1NpI4353N7zKL uG5p6BJHkGuA7SAOa4ZKns3mGkkPIkiZdGAqgKslUcxB1Fubs5jZXJAGwGSwG9OgI58Q kUqIql8Pk8tXwOlAV2g6UsA5H9Je311SiKcboR87S702+X7c2oVjY1J3vxUU6PvVLN72 NnWwt5Cylk2wzGvRG8+Lu7NipnvttuhTqnLbjEekt/I507dX64NAbN4cwH2Z7XR/P+tx r2/1JIm0KjHWg0qs7vnNmZ9RYjkoAtRvheYGlux269bkcUOKZVprPk1AYzQHOXtDKBNF sQOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741132179; x=1741736979; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+YMZiKSz5zNA/0UkYVvQA9DfWhT+3c5l8KwfO4x1oWs=; b=uDRjYX7mLTx3gn4ehNMPLbG1w0A/YDYUCH5cgU7eZcPz6G/AragYVpPqmF9d0/65PS A0ZL/3jeIvNwSzLNdjq9T8YCRt0bHEfSZKlmYzb6H1isMmQN2Bq1xRtGGJXcsR2uq5Sl Ntma6om8riuNDpz/R/8cVj44gsvIte/ofc085gx2vO/KJrkPDAtas/mapHpcnxcrTZ3P s3wr2LkOS9KVi7+VaOyxB1v5rrxYhHd//2/S/U9mtGd7aYW1bGVd9045hW3WsE5FnhvA Bl5MPF4WtJi/eEZWDsxs2NffNxdYcsEKzngBfZJfNsEEewgFjvJXgwEUF3PzthBVCCY0 zxRA== X-Gm-Message-State: AOJu0YzhiaeBWwufbpbJ+O88gAhNcUs7jQrV6pBlzRy1J2HYpUnZ5ZCn Te40+Fru3kYqwKMwHL3+dNtlKp9Af+i22Dbb77gCMp2us1rN6IdpPHCs1eqyQhybeXi49qFY8g3 WFO4Kt3HyzcyQvSg2dA/rCZ3TKxvt19o9MTEb3hRGsDDatUbbSqln9+n3JcQHwrWT9fHQWyRE5j UtwoU8g0L8KIQtdz/yyKp5H9azObEugY04cbhlHx/XiO+ssQuDQDjSx+XOrGk= X-Google-Smtp-Source: AGHT+IHyEqSO1UoerwLMdOalFYRe0Gf8bawb/DcdZP+I3DG6F3XwdwIcjvKhQhRV3aPh8doeU1NUpGVgU+jQgq2Yfw== X-Received: from pjbmf13.prod.google.com ([2002:a17:90b:184d:b0:2fa:1803:2f9f]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3b51:b0:2ee:44ec:e524 with SMTP id 98e67ed59e1d1-2ff497c5dadmr1910088a91.35.1741132179057; Tue, 04 Mar 2025 15:49:39 -0800 (PST) Date: Tue, 4 Mar 2025 23:49:24 +0000 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250304234924.1583687-1-almasrymina@google.com> Subject: [PATCH net v1] netmem: prevent TX of unreadable skbs From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mina Almasry , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , stable@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Currently on stable trees we have support for netmem/devmem RX but not TX. It is not safe to forward/redirect an RX unreadable netmem packet into the device's TX path, as the device may call dma-mapping APIs on dma addrs that should not be passed to it. Fix this by preventing the xmit of unreadable skbs. Tested by configuring tc redirect: sudo tc qdisc add dev eth1 ingress sudo tc filter add dev eth1 ingress protocol ip prio 1 flower ip_proto \ tcp src_ip 192.168.1.12 action mirred egress redirect dev eth1 Before, I see unreadable skbs in the driver's TX path passed to dma mapping APIs. After, I don't see unreadable skbs in the driver's TX path passed to dma mapping APIs. Fixes: 65249feb6b3d ("net: add support for skbs with unreadable frags") Suggested-by: Jakub Kicinski Cc: stable@vger.kernel.org Signed-off-by: Mina Almasry --- net/core/dev.c | 3 +++ 1 file changed, 3 insertions(+) base-commit: 3c6a041b317a9bb0c707343c0b99d2a29d523390 diff --git a/net/core/dev.c b/net/core/dev.c index 30da277c5a6f..63b31afacf84 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3914,6 +3914,9 @@ static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device skb = validate_xmit_xfrm(skb, features, again); + if (!skb_frags_readable(skb)) + goto out_kfree_skb; + return skb; out_kfree_skb: