瀏覽代碼

[PATCH] mv643xx_eth: Fix a NULL pointer dereference

Fix a NULL pointer dereference.

Fill in the buf_ptr and byte_cnt fields of pkt_info in
eth_tx_return_desc().

Signed-off-by: Paolo Galtieri <pgaltieri@mvista.com>
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>

 mv643xx_eth.c |   51 +++++++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 30 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Paolo Galtieri 19 年之前
父節點
當前提交
4eaa3cb35b
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      drivers/net/mv643xx_eth.c

+ 2 - 0
drivers/net/mv643xx_eth.c

@@ -2660,6 +2660,8 @@ static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv643xx_private *mp,
 	/* Pass the packet information to the caller */
 	/* Pass the packet information to the caller */
 	p_pkt_info->cmd_sts = command_status;
 	p_pkt_info->cmd_sts = command_status;
 	p_pkt_info->return_info = mp->tx_skb[tx_desc_used];
 	p_pkt_info->return_info = mp->tx_skb[tx_desc_used];
+	p_pkt_info->buf_ptr = p_tx_desc_used->buf_ptr;
+	p_pkt_info->byte_cnt = p_tx_desc_used->byte_cnt;
 	mp->tx_skb[tx_desc_used] = NULL;
 	mp->tx_skb[tx_desc_used] = NULL;
 
 
 	/* Update the next descriptor to release. */
 	/* Update the next descriptor to release. */