MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-18 07:09:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: dpaa: Pad packets to ETH_ZLEN

Browse Source 
[ Upstream commit cbd7ec0834 ]

When sending packets under 60 bytes, up to three bytes of the buffer
following the data may be leaked. Avoid this by extending all packets to
ETH_ZLEN, ensuring nothing is leaked in the padding. This bug can be
reproduced by running

	$ ping -s 11 destination

Fixes: 9ad1a37493 ("dpaa_eth: add support for DPAA Ethernet")
Suggested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20240910143144.1439910-1-sean.anderson@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sean Anderson 2024-09-10 10:31:44 -04:00 committed by Greg Kroah-Hartman
parent fc8c0cec1b
commit 34fcac2621
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
View File

@ -2285,12 +2285,12 @@ static netdev_tx_t
dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev) dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
{ {
const int queue_mapping = skb_get_queue_mapping(skb); const int queue_mapping = skb_get_queue_mapping(skb);
bool nonlinear = skb_is_nonlinear(skb);
struct rtnl_link_stats64 *percpu_stats; struct rtnl_link_stats64 *percpu_stats;
struct dpaa_percpu_priv *percpu_priv; struct dpaa_percpu_priv *percpu_priv;
struct netdev_queue *txq; struct netdev_queue *txq;
struct dpaa_priv *priv; struct dpaa_priv *priv;
struct qm_fd fd; struct qm_fd fd;
bool nonlinear;
int offset = 0; int offset = 0;
int err = 0; int err = 0;
@ -2300,6 +2300,13 @@ dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
qm_fd_clear_fd(&fd); qm_fd_clear_fd(&fd);
/* Packet data is always read as 32-bit words, so zero out any part of
* the skb which might be sent if we have to pad the packet
*/
if (__skb_put_padto(skb, ETH_ZLEN, false))
goto enomem;
nonlinear = skb_is_nonlinear(skb);
if (!nonlinear) { if (!nonlinear) {
/* We're going to store the skb backpointer at the beginning /* We're going to store the skb backpointer at the beginning
* of the data buffer, so we need a privately owned skb * of the data buffer, so we need a privately owned skb