From 3283fb786e9e0327a520174e478c059bae39b824 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 28 Mar 2022 11:56:54 +0200 Subject: [PATCH] 4.9-stable patches added patches: netdevice-add-the-case-if-dev-is-null.patch --- ...etdevice-add-the-case-if-dev-is-null.patch | 42 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 queue-4.9/netdevice-add-the-case-if-dev-is-null.patch diff --git a/queue-4.9/netdevice-add-the-case-if-dev-is-null.patch b/queue-4.9/netdevice-add-the-case-if-dev-is-null.patch new file mode 100644 index 00000000000..c9e9e42c2bd --- /dev/null +++ b/queue-4.9/netdevice-add-the-case-if-dev-is-null.patch @@ -0,0 +1,42 @@ +From b37a466837393af72fe8bcb8f1436410f3f173f3 Mon Sep 17 00:00:00 2001 +From: Yajun Deng +Date: Thu, 5 Aug 2021 19:54:34 +0800 +Subject: netdevice: add the case if dev is NULL + +From: Yajun Deng + +commit b37a466837393af72fe8bcb8f1436410f3f173f3 upstream. + +Add the case if dev is NULL in dev_{put, hold}, so the caller doesn't +need to care whether dev is NULL or not. + +Signed-off-by: Yajun Deng +Signed-off-by: David S. Miller +Cc: Pavel Machek +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/netdevice.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -3410,7 +3410,8 @@ void netdev_run_todo(void); + */ + static inline void dev_put(struct net_device *dev) + { +- this_cpu_dec(*dev->pcpu_refcnt); ++ if (dev) ++ this_cpu_dec(*dev->pcpu_refcnt); + } + + /** +@@ -3421,7 +3422,8 @@ static inline void dev_put(struct net_de + */ + static inline void dev_hold(struct net_device *dev) + { +- this_cpu_inc(*dev->pcpu_refcnt); ++ if (dev) ++ this_cpu_inc(*dev->pcpu_refcnt); + } + + /* Carrier loss detection, dial on demand. The functions netif_carrier_on diff --git a/queue-4.9/series b/queue-4.9/series index 2ef59a86f05..8df3e8e8682 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -1,2 +1,3 @@ usb-serial-pl2303-add-ibm-device-ids.patch usb-serial-simple-add-nokia-phone-driver.patch +netdevice-add-the-case-if-dev-is-null.patch -- 2.47.3