From 64335e091b2816a55fac4268232320ab192439b5 Mon Sep 17 00:00:00 2001 From: Alexander Aksenov Date: Tue, 8 Sep 2015 13:28:58 +0300 Subject: [PATCH] [FIX] US Manager: kmalloc GFP flag In pfg_create() create_img_proc() create_img_file() create_img_ip() kmalloc(..., GFP_KERNEL) -> kmalloc(..., GFP_ATOMIC) cause called only spinlocks. Change-Id: I0a8b4a5c132b9c76e54515ec75f80c807b2128ad Signed-off-by: Alexander Aksenov --- us_manager/img/img_file.c | 2 +- us_manager/img/img_ip.c | 2 +- us_manager/img/img_proc.c | 2 +- us_manager/pf/pf_group.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/us_manager/img/img_file.c b/us_manager/img/img_file.c index 2b5bbcd..d4f6596 100644 --- a/us_manager/img/img_file.c +++ b/us_manager/img/img_file.c @@ -41,7 +41,7 @@ struct img_file *create_img_file(struct dentry *dentry) { struct img_file *file; - file = kmalloc(sizeof(*file), GFP_KERNEL); + file = kmalloc(sizeof(*file), GFP_ATOMIC); if (file == NULL) { pr_err("%s: failed to allocate memory\n", __func__); return NULL; diff --git a/us_manager/img/img_ip.c b/us_manager/img/img_ip.c index ef0d0fe..8d7270c 100644 --- a/us_manager/img/img_ip.c +++ b/us_manager/img/img_ip.c @@ -38,7 +38,7 @@ struct img_ip *create_img_ip(unsigned long addr, struct probe_info *info) { struct img_ip *ip; - ip = kmalloc(sizeof(*ip), GFP_KERNEL); + ip = kmalloc(sizeof(*ip), GFP_ATOMIC); if (ip) { struct probe_info *info_new; diff --git a/us_manager/img/img_proc.c b/us_manager/img/img_proc.c index e591b27..39be315 100644 --- a/us_manager/img/img_proc.c +++ b/us_manager/img/img_proc.c @@ -50,7 +50,7 @@ struct img_proc *create_img_proc(void) { struct img_proc *proc; - proc = kmalloc(sizeof(*proc), GFP_KERNEL); + proc = kmalloc(sizeof(*proc), GFP_ATOMIC); if (proc) { INIT_LIST_HEAD(&proc->file_list); rwlock_init(&proc->rwlock); diff --git a/us_manager/pf/pf_group.c b/us_manager/pf/pf_group.c index 3303b21..bed4849 100644 --- a/us_manager/pf/pf_group.c +++ b/us_manager/pf/pf_group.c @@ -80,7 +80,7 @@ static void free_pl_struct(struct pl_struct *pls) static struct pf_group *pfg_create(void) { - struct pf_group *pfg = kmalloc(sizeof(*pfg), GFP_KERNEL); + struct pf_group *pfg = kmalloc(sizeof(*pfg), GFP_ATOMIC); if (pfg == NULL) return NULL; -- 2.7.4