mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
[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>
This commit is contained in:
parent
cb415d3004
commit
4eaa3cb35b
1 changed files with 2 additions and 0 deletions
|
@ -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. */
|
||||||
|
|
Loading…
Reference in a new issue