Commit 518314ff authored by David S. Miller's avatar David S. Miller

Merge branch 'for-davem' of...

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into wireless

John W. Linville says:

====================
Here are some more fixes intended for the 3.9 stream...

Regarding the mac80211 bits, Johannes says:

"I had changed the idle handling to simplify it, but broken the
sequencing of commands, at least for ath9k-htc, one patch restores the
sequence. The other patch fixes a crash Jouni found while stress-testing
the remain-on-channel code, when an item is deleted the work struct can
run twice and crash the second time."

As for the iwlwifi bits, Johannes says:

"The only fix here is to the passive-no-RX firmware regulatory
enforcement driver support code to not drop auth frames in quick
succession, leading to not being able to connect to APs on passive
channels in certain circumstances."

Don't forget the NFC bits, about which Samuel says:

"This time we have:

- A crash fix for when a DGRAM LLCP socket is listening while the NFC adapter
  is physically removed.
- A potential double skb free when the LLCP socket receive queue is full.
- A fix for properly handling multiple and consecutive LLCP connections, and
  not trash the socket ack log.
- A build failure for the MEI microread physical layer, now that the MEI bus
  APIs have been merged into char-misc-next."

On top of that, Stone Piao provides an mwifiex fix to avoid accessing
beyond the end of a buffer.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents da241efc 407ad2b7
...@@ -1419,6 +1419,14 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, ...@@ -1419,6 +1419,14 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
if (changes & BSS_CHANGED_IDLE && bss_conf->idle) {
/*
* If we go idle, then clearly no "passive-no-rx"
* workaround is needed any more, this is a reset.
*/
iwlagn_lift_passive_no_rx(priv);
}
if (unlikely(!iwl_is_ready(priv))) { if (unlikely(!iwl_is_ready(priv))) {
IWL_DEBUG_MAC80211(priv, "leave - not ready\n"); IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
...@@ -1450,16 +1458,6 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, ...@@ -1450,16 +1458,6 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
priv->timestamp = bss_conf->sync_tsf; priv->timestamp = bss_conf->sync_tsf;
ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK; ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
} else { } else {
/*
* If we disassociate while there are pending
* frames, just wake up the queues and let the
* frames "escape" ... This shouldn't really
* be happening to start with, but we should
* not get stuck in this case either since it
* can happen if userspace gets confused.
*/
iwlagn_lift_passive_no_rx(priv);
ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK; ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
if (ctx->ctxid == IWL_RXON_CTX_BSS) if (ctx->ctxid == IWL_RXON_CTX_BSS)
......
...@@ -1192,7 +1192,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb, ...@@ -1192,7 +1192,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
memset(&info->status, 0, sizeof(info->status)); memset(&info->status, 0, sizeof(info->status));
if (status == TX_STATUS_FAIL_PASSIVE_NO_RX && if (status == TX_STATUS_FAIL_PASSIVE_NO_RX &&
iwl_is_associated_ctx(ctx) && ctx->vif && ctx->vif &&
ctx->vif->type == NL80211_IFTYPE_STATION) { ctx->vif->type == NL80211_IFTYPE_STATION) {
/* block and stop all queues */ /* block and stop all queues */
priv->passive_no_rx = true; priv->passive_no_rx = true;
......
...@@ -1892,7 +1892,8 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, ...@@ -1892,7 +1892,8 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
} }
} }
for (i = 0; i < request->n_channels; i++) { for (i = 0; i < min_t(u32, request->n_channels,
MWIFIEX_USER_SCAN_CHAN_MAX); i++) {
chan = request->channels[i]; chan = request->channels[i];
priv->user_scan_cfg->chan_list[i].chan_number = chan->hw_value; priv->user_scan_cfg->chan_list[i].chan_number = chan->hw_value;
priv->user_scan_cfg->chan_list[i].radio_type = chan->band; priv->user_scan_cfg->chan_list[i].radio_type = chan->band;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/mei_bus.h> #include <linux/mei_cl_bus.h>
#include <linux/nfc.h> #include <linux/nfc.h>
#include <net/nfc/hci.h> #include <net/nfc/hci.h>
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
#define MICROREAD_DRIVER_NAME "microread" #define MICROREAD_DRIVER_NAME "microread"
#define MICROREAD_UUID UUID_LE(0x0bb17a78, 0x2a8e, 0x4c50, 0x94, \
0xd4, 0x50, 0x26, 0x67, 0x23, 0x77, 0x5c)
struct mei_nfc_hdr { struct mei_nfc_hdr {
u8 cmd; u8 cmd;
u8 status; u8 status;
...@@ -48,7 +45,7 @@ struct mei_nfc_hdr { ...@@ -48,7 +45,7 @@ struct mei_nfc_hdr {
#define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD) #define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD)
struct microread_mei_phy { struct microread_mei_phy {
struct mei_device *mei_device; struct mei_cl_device *device;
struct nfc_hci_dev *hdev; struct nfc_hci_dev *hdev;
int powered; int powered;
...@@ -105,14 +102,14 @@ static int microread_mei_write(void *phy_id, struct sk_buff *skb) ...@@ -105,14 +102,14 @@ static int microread_mei_write(void *phy_id, struct sk_buff *skb)
MEI_DUMP_SKB_OUT("mei frame sent", skb); MEI_DUMP_SKB_OUT("mei frame sent", skb);
r = mei_send(phy->device, skb->data, skb->len); r = mei_cl_send(phy->device, skb->data, skb->len);
if (r > 0) if (r > 0)
r = 0; r = 0;
return r; return r;
} }
static void microread_event_cb(struct mei_device *device, u32 events, static void microread_event_cb(struct mei_cl_device *device, u32 events,
void *context) void *context)
{ {
struct microread_mei_phy *phy = context; struct microread_mei_phy *phy = context;
...@@ -120,7 +117,7 @@ static void microread_event_cb(struct mei_device *device, u32 events, ...@@ -120,7 +117,7 @@ static void microread_event_cb(struct mei_device *device, u32 events,
if (phy->hard_fault != 0) if (phy->hard_fault != 0)
return; return;
if (events & BIT(MEI_EVENT_RX)) { if (events & BIT(MEI_CL_EVENT_RX)) {
struct sk_buff *skb; struct sk_buff *skb;
int reply_size; int reply_size;
...@@ -128,7 +125,7 @@ static void microread_event_cb(struct mei_device *device, u32 events, ...@@ -128,7 +125,7 @@ static void microread_event_cb(struct mei_device *device, u32 events,
if (!skb) if (!skb)
return; return;
reply_size = mei_recv(device, skb->data, MEI_NFC_MAX_READ); reply_size = mei_cl_recv(device, skb->data, MEI_NFC_MAX_READ);
if (reply_size < MEI_NFC_HEADER_SIZE) { if (reply_size < MEI_NFC_HEADER_SIZE) {
kfree(skb); kfree(skb);
return; return;
...@@ -149,8 +146,8 @@ static struct nfc_phy_ops mei_phy_ops = { ...@@ -149,8 +146,8 @@ static struct nfc_phy_ops mei_phy_ops = {
.disable = microread_mei_disable, .disable = microread_mei_disable,
}; };
static int microread_mei_probe(struct mei_device *device, static int microread_mei_probe(struct mei_cl_device *device,
const struct mei_id *id) const struct mei_cl_device_id *id)
{ {
struct microread_mei_phy *phy; struct microread_mei_phy *phy;
int r; int r;
...@@ -164,9 +161,9 @@ static int microread_mei_probe(struct mei_device *device, ...@@ -164,9 +161,9 @@ static int microread_mei_probe(struct mei_device *device,
} }
phy->device = device; phy->device = device;
mei_set_clientdata(device, phy); mei_cl_set_drvdata(device, phy);
r = mei_register_event_cb(device, microread_event_cb, phy); r = mei_cl_register_event_cb(device, microread_event_cb, phy);
if (r) { if (r) {
pr_err(MICROREAD_DRIVER_NAME ": event cb registration failed\n"); pr_err(MICROREAD_DRIVER_NAME ": event cb registration failed\n");
goto err_out; goto err_out;
...@@ -186,9 +183,9 @@ static int microread_mei_probe(struct mei_device *device, ...@@ -186,9 +183,9 @@ static int microread_mei_probe(struct mei_device *device,
return r; return r;
} }
static int microread_mei_remove(struct mei_device *device) static int microread_mei_remove(struct mei_cl_device *device)
{ {
struct microread_mei_phy *phy = mei_get_clientdata(device); struct microread_mei_phy *phy = mei_cl_get_drvdata(device);
pr_info("Removing microread\n"); pr_info("Removing microread\n");
...@@ -202,16 +199,15 @@ static int microread_mei_remove(struct mei_device *device) ...@@ -202,16 +199,15 @@ static int microread_mei_remove(struct mei_device *device)
return 0; return 0;
} }
static struct mei_id microread_mei_tbl[] = { static struct mei_cl_device_id microread_mei_tbl[] = {
{ MICROREAD_DRIVER_NAME, MICROREAD_UUID }, { MICROREAD_DRIVER_NAME },
/* required last entry */ /* required last entry */
{ } { }
}; };
MODULE_DEVICE_TABLE(mei, microread_mei_tbl); MODULE_DEVICE_TABLE(mei, microread_mei_tbl);
static struct mei_driver microread_driver = { static struct mei_cl_driver microread_driver = {
.id_table = microread_mei_tbl, .id_table = microread_mei_tbl,
.name = MICROREAD_DRIVER_NAME, .name = MICROREAD_DRIVER_NAME,
...@@ -225,7 +221,7 @@ static int microread_mei_init(void) ...@@ -225,7 +221,7 @@ static int microread_mei_init(void)
pr_debug(DRIVER_DESC ": %s\n", __func__); pr_debug(DRIVER_DESC ": %s\n", __func__);
r = mei_driver_register(&microread_driver); r = mei_cl_driver_register(&microread_driver);
if (r) { if (r) {
pr_err(MICROREAD_DRIVER_NAME ": driver registration failed\n"); pr_err(MICROREAD_DRIVER_NAME ": driver registration failed\n");
return r; return r;
...@@ -236,7 +232,7 @@ static int microread_mei_init(void) ...@@ -236,7 +232,7 @@ static int microread_mei_init(void)
static void microread_mei_exit(void) static void microread_mei_exit(void)
{ {
mei_driver_unregister(&microread_driver); mei_cl_driver_unregister(&microread_driver);
} }
module_init(microread_mei_init); module_init(microread_mei_init);
......
...@@ -2582,7 +2582,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local, ...@@ -2582,7 +2582,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
list_del(&dep->list); list_del(&dep->list);
mutex_unlock(&local->mtx); mutex_unlock(&local->mtx);
ieee80211_roc_notify_destroy(dep); ieee80211_roc_notify_destroy(dep, true);
return 0; return 0;
} }
...@@ -2622,7 +2622,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local, ...@@ -2622,7 +2622,7 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
ieee80211_start_next_roc(local); ieee80211_start_next_roc(local);
mutex_unlock(&local->mtx); mutex_unlock(&local->mtx);
ieee80211_roc_notify_destroy(found); ieee80211_roc_notify_destroy(found, true);
} else { } else {
/* work may be pending so use it all the time */ /* work may be pending so use it all the time */
found->abort = true; found->abort = true;
...@@ -2632,6 +2632,8 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local, ...@@ -2632,6 +2632,8 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
/* work will clean up etc */ /* work will clean up etc */
flush_delayed_work(&found->work); flush_delayed_work(&found->work);
WARN_ON(!found->to_be_freed);
kfree(found);
} }
return 0; return 0;
......
...@@ -63,6 +63,7 @@ ieee80211_new_chanctx(struct ieee80211_local *local, ...@@ -63,6 +63,7 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
enum ieee80211_chanctx_mode mode) enum ieee80211_chanctx_mode mode)
{ {
struct ieee80211_chanctx *ctx; struct ieee80211_chanctx *ctx;
u32 changed;
int err; int err;
lockdep_assert_held(&local->chanctx_mtx); lockdep_assert_held(&local->chanctx_mtx);
...@@ -76,6 +77,13 @@ ieee80211_new_chanctx(struct ieee80211_local *local, ...@@ -76,6 +77,13 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
ctx->conf.rx_chains_dynamic = 1; ctx->conf.rx_chains_dynamic = 1;
ctx->mode = mode; ctx->mode = mode;
/* acquire mutex to prevent idle from changing */
mutex_lock(&local->mtx);
/* turn idle off *before* setting channel -- some drivers need that */
changed = ieee80211_idle_off(local);
if (changed)
ieee80211_hw_config(local, changed);
if (!local->use_chanctx) { if (!local->use_chanctx) {
local->_oper_channel_type = local->_oper_channel_type =
cfg80211_get_chandef_type(chandef); cfg80211_get_chandef_type(chandef);
...@@ -85,14 +93,17 @@ ieee80211_new_chanctx(struct ieee80211_local *local, ...@@ -85,14 +93,17 @@ ieee80211_new_chanctx(struct ieee80211_local *local,
err = drv_add_chanctx(local, ctx); err = drv_add_chanctx(local, ctx);
if (err) { if (err) {
kfree(ctx); kfree(ctx);
return ERR_PTR(err); ctx = ERR_PTR(err);
ieee80211_recalc_idle(local);
goto out;
} }
} }
/* and keep the mutex held until the new chanctx is on the list */
list_add_rcu(&ctx->list, &local->chanctx_list); list_add_rcu(&ctx->list, &local->chanctx_list);
mutex_lock(&local->mtx); out:
ieee80211_recalc_idle(local);
mutex_unlock(&local->mtx); mutex_unlock(&local->mtx);
return ctx; return ctx;
......
...@@ -309,6 +309,7 @@ struct ieee80211_roc_work { ...@@ -309,6 +309,7 @@ struct ieee80211_roc_work {
struct ieee80211_channel *chan; struct ieee80211_channel *chan;
bool started, abort, hw_begun, notified; bool started, abort, hw_begun, notified;
bool to_be_freed;
unsigned long hw_start_time; unsigned long hw_start_time;
...@@ -1347,7 +1348,7 @@ void ieee80211_offchannel_return(struct ieee80211_local *local); ...@@ -1347,7 +1348,7 @@ void ieee80211_offchannel_return(struct ieee80211_local *local);
void ieee80211_roc_setup(struct ieee80211_local *local); void ieee80211_roc_setup(struct ieee80211_local *local);
void ieee80211_start_next_roc(struct ieee80211_local *local); void ieee80211_start_next_roc(struct ieee80211_local *local);
void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata); void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata);
void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc); void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc, bool free);
void ieee80211_sw_roc_work(struct work_struct *work); void ieee80211_sw_roc_work(struct work_struct *work);
void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc); void ieee80211_handle_roc_started(struct ieee80211_roc_work *roc);
...@@ -1361,6 +1362,7 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, ...@@ -1361,6 +1362,7 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata,
enum nl80211_iftype type); enum nl80211_iftype type);
void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata); void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata);
void ieee80211_remove_interfaces(struct ieee80211_local *local); void ieee80211_remove_interfaces(struct ieee80211_local *local);
u32 ieee80211_idle_off(struct ieee80211_local *local);
void ieee80211_recalc_idle(struct ieee80211_local *local); void ieee80211_recalc_idle(struct ieee80211_local *local);
void ieee80211_adjust_monitor_flags(struct ieee80211_sub_if_data *sdata, void ieee80211_adjust_monitor_flags(struct ieee80211_sub_if_data *sdata,
const int offset); const int offset);
......
...@@ -78,7 +78,7 @@ void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata) ...@@ -78,7 +78,7 @@ void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata)
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER); ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER);
} }
static u32 ieee80211_idle_off(struct ieee80211_local *local) u32 ieee80211_idle_off(struct ieee80211_local *local)
{ {
if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE)) if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE))
return 0; return 0;
......
...@@ -297,10 +297,13 @@ void ieee80211_start_next_roc(struct ieee80211_local *local) ...@@ -297,10 +297,13 @@ void ieee80211_start_next_roc(struct ieee80211_local *local)
} }
} }
void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc) void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc, bool free)
{ {
struct ieee80211_roc_work *dep, *tmp; struct ieee80211_roc_work *dep, *tmp;
if (WARN_ON(roc->to_be_freed))
return;
/* was never transmitted */ /* was never transmitted */
if (roc->frame) { if (roc->frame) {
cfg80211_mgmt_tx_status(&roc->sdata->wdev, cfg80211_mgmt_tx_status(&roc->sdata->wdev,
...@@ -316,9 +319,12 @@ void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc) ...@@ -316,9 +319,12 @@ void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc)
GFP_KERNEL); GFP_KERNEL);
list_for_each_entry_safe(dep, tmp, &roc->dependents, list) list_for_each_entry_safe(dep, tmp, &roc->dependents, list)
ieee80211_roc_notify_destroy(dep); ieee80211_roc_notify_destroy(dep, true);
kfree(roc); if (free)
kfree(roc);
else
roc->to_be_freed = true;
} }
void ieee80211_sw_roc_work(struct work_struct *work) void ieee80211_sw_roc_work(struct work_struct *work)
...@@ -331,6 +337,9 @@ void ieee80211_sw_roc_work(struct work_struct *work) ...@@ -331,6 +337,9 @@ void ieee80211_sw_roc_work(struct work_struct *work)
mutex_lock(&local->mtx); mutex_lock(&local->mtx);
if (roc->to_be_freed)
goto out_unlock;
if (roc->abort) if (roc->abort)
goto finish; goto finish;
...@@ -370,7 +379,7 @@ void ieee80211_sw_roc_work(struct work_struct *work) ...@@ -370,7 +379,7 @@ void ieee80211_sw_roc_work(struct work_struct *work)
finish: finish:
list_del(&roc->list); list_del(&roc->list);
started = roc->started; started = roc->started;
ieee80211_roc_notify_destroy(roc); ieee80211_roc_notify_destroy(roc, !roc->abort);
if (started) { if (started) {
drv_flush(local, false); drv_flush(local, false);
...@@ -410,7 +419,7 @@ static void ieee80211_hw_roc_done(struct work_struct *work) ...@@ -410,7 +419,7 @@ static void ieee80211_hw_roc_done(struct work_struct *work)
list_del(&roc->list); list_del(&roc->list);
ieee80211_roc_notify_destroy(roc); ieee80211_roc_notify_destroy(roc, true);
/* if there's another roc, start it now */ /* if there's another roc, start it now */
ieee80211_start_next_roc(local); ieee80211_start_next_roc(local);
...@@ -460,12 +469,14 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata) ...@@ -460,12 +469,14 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata)
list_for_each_entry_safe(roc, tmp, &tmp_list, list) { list_for_each_entry_safe(roc, tmp, &tmp_list, list) {
if (local->ops->remain_on_channel) { if (local->ops->remain_on_channel) {
list_del(&roc->list); list_del(&roc->list);
ieee80211_roc_notify_destroy(roc); ieee80211_roc_notify_destroy(roc, true);
} else { } else {
ieee80211_queue_delayed_work(&local->hw, &roc->work, 0); ieee80211_queue_delayed_work(&local->hw, &roc->work, 0);
/* work will clean up etc */ /* work will clean up etc */
flush_delayed_work(&roc->work); flush_delayed_work(&roc->work);
WARN_ON(!roc->to_be_freed);
kfree(roc);
} }
} }
......
...@@ -107,8 +107,6 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local, bool listen, ...@@ -107,8 +107,6 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local, bool listen,
accept_sk->sk_state_change(sk); accept_sk->sk_state_change(sk);
bh_unlock_sock(accept_sk); bh_unlock_sock(accept_sk);
sock_orphan(accept_sk);
} }
if (listen == true) { if (listen == true) {
...@@ -134,8 +132,6 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local, bool listen, ...@@ -134,8 +132,6 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local, bool listen,
bh_unlock_sock(sk); bh_unlock_sock(sk);
sock_orphan(sk);
sk_del_node_init(sk); sk_del_node_init(sk);
} }
...@@ -164,8 +160,6 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local, bool listen, ...@@ -164,8 +160,6 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local, bool listen,
bh_unlock_sock(sk); bh_unlock_sock(sk);
sock_orphan(sk);
sk_del_node_init(sk); sk_del_node_init(sk);
} }
...@@ -827,7 +821,6 @@ static void nfc_llcp_recv_ui(struct nfc_llcp_local *local, ...@@ -827,7 +821,6 @@ static void nfc_llcp_recv_ui(struct nfc_llcp_local *local,
skb_get(skb); skb_get(skb);
} else { } else {
pr_err("Receive queue is full\n"); pr_err("Receive queue is full\n");
kfree_skb(skb);
} }
nfc_llcp_sock_put(llcp_sock); nfc_llcp_sock_put(llcp_sock);
...@@ -1028,7 +1021,6 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local, ...@@ -1028,7 +1021,6 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local,
skb_get(skb); skb_get(skb);
} else { } else {
pr_err("Receive queue is full\n"); pr_err("Receive queue is full\n");
kfree_skb(skb);
} }
} }
......
...@@ -270,7 +270,9 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *parent, ...@@ -270,7 +270,9 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *parent,
} }
if (sk->sk_state == LLCP_CONNECTED || !newsock) { if (sk->sk_state == LLCP_CONNECTED || !newsock) {
nfc_llcp_accept_unlink(sk); list_del_init(&lsk->accept_queue);
sock_put(sk);
if (newsock) if (newsock)
sock_graft(sk, newsock); sock_graft(sk, newsock);
...@@ -464,8 +466,6 @@ static int llcp_sock_release(struct socket *sock) ...@@ -464,8 +466,6 @@ static int llcp_sock_release(struct socket *sock)
nfc_llcp_accept_unlink(accept_sk); nfc_llcp_accept_unlink(accept_sk);
release_sock(accept_sk); release_sock(accept_sk);
sock_orphan(accept_sk);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment