4.4-stable patches

added patches:
	cpufreq-use-struct-kobj_attribute-instead-of-struct-global_attr.patch

diff --git a/queue-4.4/cpufreq-use-struct-kobj_attribute-instead-of-struct-global_attr.patch b/queue-4.4/cpufreq-use-struct-kobj_attribute-instead-of-struct-global_attr.patch
new file mode 100644 (file)
index 0000000..bbdfc65
--- /dev/null
+++ b/queue-4.4/cpufreq-use-struct-kobj_attribute-instead-of-struct-global_attr.patch
@@ -0,0 +1,193 @@
+From 625c85a62cb7d3c79f6e16de3cfa972033658250 Mon Sep 17 00:00:00 2001
+From: Viresh Kumar <viresh.kumar@linaro.org>
+Date: Fri, 25 Jan 2019 12:53:07 +0530
+Subject: cpufreq: Use struct kobj_attribute instead of struct global_attr
+
+From: Viresh Kumar <viresh.kumar@linaro.org>
+
+commit 625c85a62cb7d3c79f6e16de3cfa972033658250 upstream.
+
+The cpufreq_global_kobject is created using kobject_create_and_add()
+helper, which assigns the kobj_type as dynamic_kobj_ktype and show/store
+routines are set to kobj_attr_show() and kobj_attr_store().
+
+These routines pass struct kobj_attribute as an argument to the
+show/store callbacks. But all the cpufreq files created using the
+cpufreq_global_kobject expect the argument to be of type struct
+attribute. Things work fine currently as no one accesses the "attr"
+argument. We may not see issues even if the argument is used, as struct
+kobj_attribute has struct attribute as its first element and so they
+will both get same address.
+
+But this is logically incorrect and we should rather use struct
+kobj_attribute instead of struct global_attr in the cpufreq core and
+drivers and the show/store callbacks should take struct kobj_attribute
+as argument instead.
+
+This bug is caught using CFI CLANG builds in android kernel which
+catches mismatch in function prototypes for such callbacks.
+
+Reported-by: Donghee Han <dh.han@samsung.com>
+Reported-by: Sangkyu Kim <skwith.kim@samsung.com>
+Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ drivers/cpufreq/cpufreq.c          |    6 +++---
+ drivers/cpufreq/cpufreq_governor.h |   10 +++++-----
+ drivers/cpufreq/intel_pstate.c     |   14 +++++++-------
+ include/linux/cpufreq.h            |   12 ++----------
+ 4 files changed, 17 insertions(+), 25 deletions(-)
+
+--- a/drivers/cpufreq/cpufreq.c
++++ b/drivers/cpufreq/cpufreq.c
+@@ -474,13 +474,13 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_transitio
+  *                          SYSFS INTERFACE                          *
+  *********************************************************************/
+ static ssize_t show_boost(struct kobject *kobj,
+-                               struct attribute *attr, char *buf)
++                        struct kobj_attribute *attr, char *buf)
+ {
+       return sprintf(buf, "%d\n", cpufreq_driver->boost_enabled);
+ }
+ 
+-static ssize_t store_boost(struct kobject *kobj, struct attribute *attr,
+-                                const char *buf, size_t count)
++static ssize_t store_boost(struct kobject *kobj, struct kobj_attribute *attr,
++                         const char *buf, size_t count)
+ {
+       int ret, enable;
+ 
+--- a/drivers/cpufreq/cpufreq_governor.h
++++ b/drivers/cpufreq/cpufreq_governor.h
+@@ -48,11 +48,11 @@ enum {OD_NORMAL_SAMPLE, OD_SUB_SAMPLE};
+ 
+ /* Create attributes */
+ #define gov_sys_attr_ro(_name)                                                \
+-static struct global_attr _name##_gov_sys =                           \
++static struct kobj_attribute _name##_gov_sys =                                \
+ __ATTR(_name, 0444, show_##_name##_gov_sys, NULL)
+ 
+ #define gov_sys_attr_rw(_name)                                                \
+-static struct global_attr _name##_gov_sys =                           \
++static struct kobj_attribute _name##_gov_sys =                                \
+ __ATTR(_name, 0644, show_##_name##_gov_sys, store_##_name##_gov_sys)
+ 
+ #define gov_pol_attr_ro(_name)                                                \
+@@ -74,7 +74,7 @@ __ATTR(_name, 0644, show_##_name##_gov_p
+ /* Create show/store routines */
+ #define show_one(_gov, file_name)                                     \
+ static ssize_t show_##file_name##_gov_sys                             \
+-(struct kobject *kobj, struct attribute *attr, char *buf)             \
++(struct kobject *kobj, struct kobj_attribute *attr, char *buf)                \
+ {                                                                     \
+       struct _gov##_dbs_tuners *tuners = _gov##_dbs_cdata.gdbs_data->tuners; \
+       return sprintf(buf, "%u\n", tuners->file_name);                 \
+@@ -90,7 +90,7 @@ static ssize_t show_##file_name##_gov_po
+ 
+ #define store_one(_gov, file_name)                                    \
+ static ssize_t store_##file_name##_gov_sys                            \
+-(struct kobject *kobj, struct attribute *attr, const char *buf, size_t count) \
++(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count) \
+ {                                                                     \
+       struct dbs_data *dbs_data = _gov##_dbs_cdata.gdbs_data;         \
+       return store_##file_name(dbs_data, buf, count);                 \
+@@ -254,7 +254,7 @@ static inline int delay_for_sampling_rat
+ 
+ #define declare_show_sampling_rate_min(_gov)                          \
+ static ssize_t show_sampling_rate_min_gov_sys                         \
+-(struct kobject *kobj, struct attribute *attr, char *buf)             \
++(struct kobject *kobj, struct kobj_attribute *attr, char *buf)                \
+ {                                                                     \
+       struct dbs_data *dbs_data = _gov##_dbs_cdata.gdbs_data;         \
+       return sprintf(buf, "%u\n", dbs_data->min_sampling_rate);       \
+--- a/drivers/cpufreq/intel_pstate.c
++++ b/drivers/cpufreq/intel_pstate.c
+@@ -368,13 +368,13 @@ static void __init intel_pstate_debug_ex
+ /************************** sysfs begin ************************/
+ #define show_one(file_name, object)                                   \
+       static ssize_t show_##file_name                                 \
+-      (struct kobject *kobj, struct attribute *attr, char *buf)       \
++      (struct kobject *kobj, struct kobj_attribute *attr, char *buf)  \
+       {                                                               \
+               return sprintf(buf, "%u\n", limits->object);            \
+       }
+ 
+ static ssize_t show_turbo_pct(struct kobject *kobj,
+-                              struct attribute *attr, char *buf)
++                              struct kobj_attribute *attr, char *buf)
+ {
+       struct cpudata *cpu;
+       int total, no_turbo, turbo_pct;
+@@ -390,7 +390,7 @@ static ssize_t show_turbo_pct(struct kob
+ }
+ 
+ static ssize_t show_num_pstates(struct kobject *kobj,
+-                              struct attribute *attr, char *buf)
++                              struct kobj_attribute *attr, char *buf)
+ {
+       struct cpudata *cpu;
+       int total;
+@@ -401,7 +401,7 @@ static ssize_t show_num_pstates(struct k
+ }
+ 
+ static ssize_t show_no_turbo(struct kobject *kobj,
+-                           struct attribute *attr, char *buf)
++                           struct kobj_attribute *attr, char *buf)
+ {
+       ssize_t ret;
+ 
+@@ -414,7 +414,7 @@ static ssize_t show_no_turbo(struct kobj
+       return ret;
+ }
+ 
+-static ssize_t store_no_turbo(struct kobject *a, struct attribute *b,
++static ssize_t store_no_turbo(struct kobject *a, struct kobj_attribute *b,
+                             const char *buf, size_t count)
+ {
+       unsigned int input;
+@@ -438,7 +438,7 @@ static ssize_t store_no_turbo(struct kob
+       return count;
+ }
+ 
+-static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b,
++static ssize_t store_max_perf_pct(struct kobject *a, struct kobj_attribute *b,
+                                 const char *buf, size_t count)
+ {
+       unsigned int input;
+@@ -463,7 +463,7 @@ static ssize_t store_max_perf_pct(struct
+       return count;
+ }
+ 
+-static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b,
++static ssize_t store_min_perf_pct(struct kobject *a, struct kobj_attribute *b,
+                                 const char *buf, size_t count)
+ {
+       unsigned int input;
+--- a/include/linux/cpufreq.h
++++ b/include/linux/cpufreq.h
+@@ -203,20 +203,12 @@ __ATTR(_name, _perm, show_##_name, NULL)
+ static struct freq_attr _name =                       \
+ __ATTR(_name, 0644, show_##_name, store_##_name)
+ 
+-struct global_attr {
+-      struct attribute attr;
+-      ssize_t (*show)(struct kobject *kobj,
+-                      struct attribute *attr, char *buf);
+-      ssize_t (*store)(struct kobject *a, struct attribute *b,
+-                       const char *c, size_t count);
+-};
+-
+ #define define_one_global_ro(_name)           \
+-static struct global_attr _name =             \
++static struct kobj_attribute _name =          \
+ __ATTR(_name, 0444, show_##_name, NULL)
+ 
+ #define define_one_global_rw(_name)           \
+-static struct global_attr _name =             \
++static struct kobj_attribute _name =          \
+ __ATTR(_name, 0644, show_##_name, store_##_name)
+ 
+ 

diff --git a/queue-4.4/series b/queue-4.4/series
index fe67ffa7ba6b2638fdaf710090eca3f80f703c32..885a07f0e598588e6fb1ff6c80adf4e9f15a263c 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -55,3 +55,4 @@ x86-uaccess-don-t-leak-the-ac-flag-into-__put_user-value-evaluation.patch
 usb-serial-option-add-telit-me910-ecm-composition.patch
 usb-serial-cp210x-add-id-for-ingenico-3070.patch
 usb-serial-ftdi_sio-add-id-for-hjelmslund-electronics-usb485.patch
+cpufreq-use-struct-kobj_attribute-instead-of-struct-global_attr.patch