“45250f4b7121bcfba7f05030fab35435b02039e7”上不存在“...native/git@gitcode.net:openanolis/dragonwell8_jdk.git”
提交 36976cc7 编写于 作者: D Duoming Zhou 提交者: Zheng Zengkai

nfc: replace improper check device_is_registered() in netlink related functions

stable inclusion
from stable-v5.10.115
commit 8a9e7c64f4a02c4c397e55ba379609168ec7df4a
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5B79D
CVE: CVE-2022-1974

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8a9e7c64f4a02c4c397e55ba379609168ec7df4a

--------------------------------

commit da5c0f11 upstream.

The device_is_registered() in nfc core is used to check whether
nfc device is registered in netlink related functions such as
nfc_fw_download(), nfc_dev_up() and so on. Although device_is_registered()
is protected by device_lock, there is still a race condition between
device_del() and device_is_registered(). The root cause is that
kobject_del() in device_del() is not protected by device_lock.

   (cleanup task)         |     (netlink task)
                          |
nfc_unregister_device     | nfc_fw_download
 device_del               |  device_lock
  ...                     |   if (!device_is_registered)//(1)
  kobject_del//(2)        |   ...
 ...                      |  device_unlock

The device_is_registered() returns the value of state_in_sysfs and
the state_in_sysfs is set to zero in kobject_del(). If we pass check in
position (1), then set zero in position (2). As a result, the check
in position (1) is useless.

This patch uses bool variable instead of device_is_registered() to judge
whether the nfc device is registered, which is well synchronized.

Fixes: 3e256b8f ("NFC: add nfc subsystem core")
Signed-off-by: NDuoming Zhou <duoming@zju.edu.cn>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NBaisong Zhong <zhongbaisong@huawei.com>
Reviewed-by: NXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: NWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 afdd9627
...@@ -38,7 +38,7 @@ int nfc_fw_download(struct nfc_dev *dev, const char *firmware_name) ...@@ -38,7 +38,7 @@ int nfc_fw_download(struct nfc_dev *dev, const char *firmware_name)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -94,7 +94,7 @@ int nfc_dev_up(struct nfc_dev *dev) ...@@ -94,7 +94,7 @@ int nfc_dev_up(struct nfc_dev *dev)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -142,7 +142,7 @@ int nfc_dev_down(struct nfc_dev *dev) ...@@ -142,7 +142,7 @@ int nfc_dev_down(struct nfc_dev *dev)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -206,7 +206,7 @@ int nfc_start_poll(struct nfc_dev *dev, u32 im_protocols, u32 tm_protocols) ...@@ -206,7 +206,7 @@ int nfc_start_poll(struct nfc_dev *dev, u32 im_protocols, u32 tm_protocols)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -245,7 +245,7 @@ int nfc_stop_poll(struct nfc_dev *dev) ...@@ -245,7 +245,7 @@ int nfc_stop_poll(struct nfc_dev *dev)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -290,7 +290,7 @@ int nfc_dep_link_up(struct nfc_dev *dev, int target_index, u8 comm_mode) ...@@ -290,7 +290,7 @@ int nfc_dep_link_up(struct nfc_dev *dev, int target_index, u8 comm_mode)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -334,7 +334,7 @@ int nfc_dep_link_down(struct nfc_dev *dev) ...@@ -334,7 +334,7 @@ int nfc_dep_link_down(struct nfc_dev *dev)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -400,7 +400,7 @@ int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol) ...@@ -400,7 +400,7 @@ int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -446,7 +446,7 @@ int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx, u8 mode) ...@@ -446,7 +446,7 @@ int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx, u8 mode)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -493,7 +493,7 @@ int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx, struct sk_buff *skb, ...@@ -493,7 +493,7 @@ int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx, struct sk_buff *skb,
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
kfree_skb(skb); kfree_skb(skb);
goto error; goto error;
...@@ -550,7 +550,7 @@ int nfc_enable_se(struct nfc_dev *dev, u32 se_idx) ...@@ -550,7 +550,7 @@ int nfc_enable_se(struct nfc_dev *dev, u32 se_idx)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -599,7 +599,7 @@ int nfc_disable_se(struct nfc_dev *dev, u32 se_idx) ...@@ -599,7 +599,7 @@ int nfc_disable_se(struct nfc_dev *dev, u32 se_idx)
device_lock(&dev->dev); device_lock(&dev->dev);
if (!device_is_registered(&dev->dev)) { if (dev->shutting_down) {
rc = -ENODEV; rc = -ENODEV;
goto error; goto error;
} }
...@@ -1126,6 +1126,7 @@ int nfc_register_device(struct nfc_dev *dev) ...@@ -1126,6 +1126,7 @@ int nfc_register_device(struct nfc_dev *dev)
dev->rfkill = NULL; dev->rfkill = NULL;
} }
} }
dev->shutting_down = false;
device_unlock(&dev->dev); device_unlock(&dev->dev);
rc = nfc_genl_device_added(dev); rc = nfc_genl_device_added(dev);
...@@ -1158,12 +1159,10 @@ void nfc_unregister_device(struct nfc_dev *dev) ...@@ -1158,12 +1159,10 @@ void nfc_unregister_device(struct nfc_dev *dev)
rfkill_unregister(dev->rfkill); rfkill_unregister(dev->rfkill);
rfkill_destroy(dev->rfkill); rfkill_destroy(dev->rfkill);
} }
dev->shutting_down = true;
device_unlock(&dev->dev); device_unlock(&dev->dev);
if (dev->ops->check_presence) { if (dev->ops->check_presence) {
device_lock(&dev->dev);
dev->shutting_down = true;
device_unlock(&dev->dev);
del_timer_sync(&dev->check_pres_timer); del_timer_sync(&dev->check_pres_timer);
cancel_work_sync(&dev->check_pres_work); cancel_work_sync(&dev->check_pres_work);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册