evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netfilter: xt_recent: use proc_create_data()

Browse source 
Fixes a crash in recent_seq_start:

BUG: unable to handle kernel NULL pointer dereference at 0000000000000100
IP: [<ffffffffa002119c>] recent_seq_start+0x4c/0x90 [xt_recent]
PGD 17d33c067 PUD 107afe067 PMD 0
Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
CPU 0
Modules linked in: ipt_LOG xt_recent af_packet iptable_nat nf_nat nf_conntrack_ipv4 nf_conntrack nf_defrag_ipv4 xt_tcpudp iptable_filter ip_tables x_tables ext2 nls_utf8 fuse sr_mod cdrom [last unloaded: ntfs]
Pid: 32373, comm: cat Not tainted 2.6.27-04ab591808565f968d4406f6435090ad671ebdab #6
RIP: 0010:[<ffffffffa002119c>]  [<ffffffffa002119c>] recent_seq_start+0x4c/0x90 [xt_recent]
RSP: 0018:ffff88015fed7e28  EFLAGS: 00010246
...

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan 2008-10-20 03:33:49 -07:00 • committed by David S. Miller
parent 311670f3ea
commit b09eec161b
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/netfilter/xt_recent.c
View file

@ -318,15 +318,15 @@ static bool recent_mt_check(const struct xt_mtchk_param *par)
for (i = 0; i < ip_list_hash_size; i++) for (i = 0; i < ip_list_hash_size; i++)
INIT_LIST_HEAD(&t->iphash[i]); INIT_LIST_HEAD(&t->iphash[i]);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
t->proc = proc_create(t->name, ip_list_perms, recent_proc_dir, t->proc = proc_create_data(t->name, ip_list_perms, recent_proc_dir,
&recent_mt_fops); &recent_mt_fops, t);
if (t->proc == NULL) { if (t->proc == NULL) {
kfree(t); kfree(t);
goto out; goto out;
} }
#ifdef CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT #ifdef CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT
t->proc_old = proc_create(t->name, ip_list_perms, proc_old_dir, t->proc_old = proc_create_data(t->name, ip_list_perms, proc_old_dir,
&recent_old_fops); &recent_old_fops, t);
if (t->proc_old == NULL) { if (t->proc_old == NULL) {
remove_proc_entry(t->name, proc_old_dir); remove_proc_entry(t->name, proc_old_dir);
kfree(t); kfree(t);
@ -334,11 +334,9 @@ static bool recent_mt_check(const struct xt_mtchk_param *par)
} }
t->proc_old->uid = ip_list_uid; t->proc_old->uid = ip_list_uid;
t->proc_old->gid = ip_list_gid; t->proc_old->gid = ip_list_gid;
t->proc_old->data = t;
#endif #endif
t->proc->uid = ip_list_uid; t->proc->uid = ip_list_uid;
t->proc->gid = ip_list_gid; t->proc->gid = ip_list_gid;
t->proc->data = t;
#endif #endif
spin_lock_bh(&recent_lock); spin_lock_bh(&recent_lock);
list_add_tail(&t->list, &tables); list_add_tail(&t->list, &tables);