1 files changed, 50 insertions, 18 deletions

diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 4c51714ee741..c1b5285cbde7 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -58,7 +58,7 @@ static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target,
 {
         void *hdr;
 
-        hdr = genlmsg_put(msg, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq,
+        hdr = genlmsg_put(msg, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,
                           &nfc_genl_family, flags, NFC_CMD_GET_TARGET);
         if (!hdr)
                 return -EMSGSIZE;
@@ -165,7 +165,7 @@ int nfc_genl_targets_found(struct nfc_dev *dev)
         struct sk_buff *msg;
         void *hdr;
 
-        dev->genl_data.poll_req_pid = 0;
+        dev->genl_data.poll_req_portid = 0;
 
         msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
         if (!msg)
@@ -347,13 +347,13 @@ free_msg:
 }
 
 static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev,
-                                u32 pid, u32 seq,
+                                u32 portid, u32 seq,
                                 struct netlink_callback *cb,
                                 int flags)
 {
         void *hdr;
 
-        hdr = genlmsg_put(msg, pid, seq, &nfc_genl_family, flags,
+        hdr = genlmsg_put(msg, portid, seq, &nfc_genl_family, flags,
                           NFC_CMD_GET_DEVICE);
         if (!hdr)
                 return -EMSGSIZE;
@@ -401,7 +401,7 @@ static int nfc_genl_dump_devices(struct sk_buff *skb,
         while (dev) {
                 int rc;
 
-                rc = nfc_genl_send_device(skb, dev, NETLINK_CB(cb->skb).pid,
+                rc = nfc_genl_send_device(skb, dev, NETLINK_CB(cb->skb).portid,
                                           cb->nlh->nlmsg_seq, cb, NLM_F_MULTI);
                 if (rc < 0)
                         break;
@@ -520,7 +520,7 @@ static int nfc_genl_get_device(struct sk_buff *skb, struct genl_info *info)
                 goto out_putdev;
         }
 
-        rc = nfc_genl_send_device(msg, dev, info->snd_pid, info->snd_seq,
+        rc = nfc_genl_send_device(msg, dev, info->snd_portid, info->snd_seq,
                                   NULL, 0);
         if (rc < 0)
                 goto out_free;
@@ -611,7 +611,7 @@ static int nfc_genl_start_poll(struct sk_buff *skb, struct genl_info *info)
 
         rc = nfc_start_poll(dev, im_protocols, tm_protocols);
         if (!rc)
-                dev->genl_data.poll_req_pid = info->snd_pid;
+                dev->genl_data.poll_req_portid = info->snd_portid;
 
         mutex_unlock(&dev->genl_data.genl_data_mutex);
 
@@ -645,13 +645,13 @@ static int nfc_genl_stop_poll(struct sk_buff *skb, struct genl_info *info)
 
         mutex_lock(&dev->genl_data.genl_data_mutex);
 
-        if (dev->genl_data.poll_req_pid != info->snd_pid) {
+        if (dev->genl_data.poll_req_portid != info->snd_portid) {
                 rc = -EBUSY;
                 goto out;
         }
 
         rc = nfc_stop_poll(dev);
-        dev->genl_data.poll_req_pid = 0;
+        dev->genl_data.poll_req_portid = 0;
 
 out:
         mutex_unlock(&dev->genl_data.genl_data_mutex);
@@ -761,38 +761,70 @@ static struct genl_ops nfc_genl_ops[] = {
         },
 };
 
-static int nfc_genl_rcv_nl_event(struct notifier_block *this,
-                                 unsigned long event, void *ptr)
+
+struct urelease_work {
+        struct  work_struct w;
+        int     portid;
+};
+
+static void nfc_urelease_event_work(struct work_struct *work)
 {
-        struct netlink_notify *n = ptr;
+        struct urelease_work *w = container_of(work, struct urelease_work, w);
         struct class_dev_iter iter;
         struct nfc_dev *dev;
 
-        if (event != NETLINK_URELEASE || n->protocol != NETLINK_GENERIC)
-                goto out;
+        pr_debug("portid %d\n", w->portid);
 
-        pr_debug("NETLINK_URELEASE event from id %d\n", n->pid);
+        mutex_lock(&nfc_devlist_mutex);
 
         nfc_device_iter_init(&iter);
         dev = nfc_device_iter_next(&iter);
 
         while (dev) {
-                if (dev->genl_data.poll_req_pid == n->pid) {
+                mutex_lock(&dev->genl_data.genl_data_mutex);
+
+                if (dev->genl_data.poll_req_portid == w->portid) {
                         nfc_stop_poll(dev);
-                        dev->genl_data.poll_req_pid = 0;
+                        dev->genl_data.poll_req_portid = 0;
                 }
+
+                mutex_unlock(&dev->genl_data.genl_data_mutex);
+
                 dev = nfc_device_iter_next(&iter);
         }
 
         nfc_device_iter_exit(&iter);
 
+        mutex_unlock(&nfc_devlist_mutex);
+
+        kfree(w);
+}
+
+static int nfc_genl_rcv_nl_event(struct notifier_block *this,
+                                 unsigned long event, void *ptr)
+{
+        struct netlink_notify *n = ptr;
+        struct urelease_work *w;
+
+        if (event != NETLINK_URELEASE || n->protocol != NETLINK_GENERIC)
+                goto out;
+
+        pr_debug("NETLINK_URELEASE event from id %d\n", n->portid);
+
+        w = kmalloc(sizeof(*w), GFP_ATOMIC);
+        if (w) {
+                INIT_WORK((struct work_struct *) w, nfc_urelease_event_work);
+                w->portid = n->portid;
+                schedule_work((struct work_struct *) w);
+        }
+
 out:
         return NOTIFY_DONE;
 }
 
 void nfc_genl_data_init(struct nfc_genl_data *genl_data)
 {
-        genl_data->poll_req_pid = 0;
+        genl_data->poll_req_portid = 0;
         mutex_init(&genl_data->genl_data_mutex);
 }