malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

UPSTREAM: netfilter: xt_IDLETIMER: fix sysfs callback function type

Browse Source 
Use struct device_attribute instead of struct idletimer_tg_attr, and
the correct callback function type to avoid indirect call mismatches
with Control Flow Integrity checking.

Bug: 117299373
Change-Id: I5cc50171e01a5162ef504a726fe3ed4b51941b34
(cherry-picked from commit 20fdaf6e1e313b4efa48243d5250526eb43ea70d)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Sami Tolvanen 2019-02-26 13:07:52 -08:00 committed by Maciej Żenczykowski
parent 791557a04a
commit 82b2a4a52e
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/netfilter/xt_IDLETIMER.c
View File

@ -51,19 +51,13 @@
#include <net/sock.h>
#include <net/inet_sock.h>
struct idletimer_tg_attr {
struct attribute attr;
ssize_t (*show)(struct kobject *kobj,
struct attribute *attr, char *buf);
};
struct idletimer_tg {
struct list_head entry;
struct timer_list timer;
struct work_struct work;
struct kobject *kobj;
struct idletimer_tg_attr attr;
struct device_attribute attr;
struct timespec delayed_timer_trigger;
struct timespec last_modified_timer;
@ -184,8 +178,8 @@ struct idletimer_tg *__idletimer_tg_find_by_label(const char *label)
return NULL;
}
static ssize_t idletimer_tg_show(struct kobject *kobj, struct attribute *attr,
char *buf)
static ssize_t idletimer_tg_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct idletimer_tg *timer;
unsigned long expires = 0;
@ -193,7 +187,7 @@ static ssize_t idletimer_tg_show(struct kobject *kobj, struct attribute *attr,
mutex_lock(&list_mutex);
timer = __idletimer_tg_find_by_label(attr->name);
timer = __idletimer_tg_find_by_label(attr->attr.name);
if (timer)
expires = timer->timer.expires;