diff options
| author |   Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2020-11-13 22:22:43 +0100 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2020-11-24 17:01:06 +0200 |
| commit | a31eb615646a63370aa1da1053c45439c7653d83 (patch) | |
| tree | c307ad4d4d333f001b6aa35e5284aedb56b74e91 /drivers/net/wireless/intersil/orinoco/orinoco_usb.c | |
| parent | brcmfmac: fix error return code in brcmf_cfg80211_connect() (diff) | |
| download | wireguard-linux-a31eb615646a63370aa1da1053c45439c7653d83.tar.xz wireguard-linux-a31eb615646a63370aa1da1053c45439c7653d83.zip | |
orinoco: Move context allocation after processing the skb
ezusb_xmit() allocates a context which is leaked if
orinoco_process_xmit_skb() returns an error.
Move ezusb_alloc_ctx() after the invocation of
orinoco_process_xmit_skb() because the context is not needed so early.
ezusb_access_ltv() will cleanup the context in case of an error.
Fixes: bac6fafd4d6a0 ("orinoco: refactor xmit path")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201113212252.2243570-2-bigeasy@linutronix.de
Diffstat (limited to 'drivers/net/wireless/intersil/orinoco/orinoco_usb.c')
| -rw-r--r-- | drivers/net/wireless/intersil/orinoco/orinoco_usb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c index 046f2453ad5d..8419e13a79e2 100644 --- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c @@ -1221,13 +1221,6 @@ static netdev_tx_t ezusb_xmit(struct sk_buff *skb, struct net_device *dev) if (skb->len < ETH_HLEN) goto drop; - ctx = ezusb_alloc_ctx(upriv, EZUSB_RID_TX, 0); - if (!ctx) - goto busy; - - memset(ctx->buf, 0, BULK_BUF_SIZE); - buf = ctx->buf->data; - tx_control = 0; err = orinoco_process_xmit_skb(skb, dev, priv, &tx_control, @@ -1235,6 +1228,13 @@ static netdev_tx_t ezusb_xmit(struct sk_buff *skb, struct net_device *dev) if (err) goto drop; + ctx = ezusb_alloc_ctx(upriv, EZUSB_RID_TX, 0); + if (!ctx) + goto drop; + + memset(ctx->buf, 0, BULK_BUF_SIZE); + buf = ctx->buf->data; + { __le16 *tx_cntl = (__le16 *)buf; *tx_cntl = cpu_to_le16(tx_control); |