diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-10-26 15:21:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-27 14:37:33 -0400 |
commit | e5ccd96110d5ac0f73b695ba606feb6d69472f26 (patch) | |
tree | 6178c6bc06df10664837c9589afdebf6369a9c98 /drivers/net/ehea/ehea_main.c | |
parent | b914c4ea929a4ba6fb97967800dc473c31552b98 (diff) |
ehea: fix use after free
ehea_start_xmit() dereferences skb after its freeing in ehea_xmit3() to
get vlan tags.
Move the offending block before the potential ehea_xmit3() call.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ehea/ehea_main.c')
-rw-r--r-- | drivers/net/ehea/ehea_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index bb7d306fb446..e59d38629099 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -2249,6 +2249,11 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2249 | memset(swqe, 0, SWQE_HEADER_SIZE); | 2249 | memset(swqe, 0, SWQE_HEADER_SIZE); |
2250 | atomic_dec(&pr->swqe_avail); | 2250 | atomic_dec(&pr->swqe_avail); |
2251 | 2251 | ||
2252 | if (vlan_tx_tag_present(skb)) { | ||
2253 | swqe->tx_control |= EHEA_SWQE_VLAN_INSERT; | ||
2254 | swqe->vlan_tag = vlan_tx_tag_get(skb); | ||
2255 | } | ||
2256 | |||
2252 | if (skb->len <= SWQE3_MAX_IMM) { | 2257 | if (skb->len <= SWQE3_MAX_IMM) { |
2253 | u32 sig_iv = port->sig_comp_iv; | 2258 | u32 sig_iv = port->sig_comp_iv; |
2254 | u32 swqe_num = pr->swqe_id_counter; | 2259 | u32 swqe_num = pr->swqe_id_counter; |
@@ -2279,11 +2284,6 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2279 | } | 2284 | } |
2280 | pr->swqe_id_counter += 1; | 2285 | pr->swqe_id_counter += 1; |
2281 | 2286 | ||
2282 | if (vlan_tx_tag_present(skb)) { | ||
2283 | swqe->tx_control |= EHEA_SWQE_VLAN_INSERT; | ||
2284 | swqe->vlan_tag = vlan_tx_tag_get(skb); | ||
2285 | } | ||
2286 | |||
2287 | if (netif_msg_tx_queued(port)) { | 2287 | if (netif_msg_tx_queued(port)) { |
2288 | ehea_info("post swqe on QP %d", pr->qp->init_attr.qp_nr); | 2288 | ehea_info("post swqe on QP %d", pr->qp->init_attr.qp_nr); |
2289 | ehea_dump(swqe, 512, "swqe"); | 2289 | ehea_dump(swqe, 512, "swqe"); |