TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: qtaguid: Don't BUG_ON if create_if_tag_stat fails

Browse Source 
If create_if_tag_stat fails to allocate memory (GFP_ATOMIC) the
following will happen:

qtaguid: iface_stat: tag stat alloc failed
...
kernel BUG at xt_qtaguid.c:1482!

Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
This commit is contained in:
Pontus Fuchs
2012-11-19 11:44:51 -08:00
committed by jp abgrall
parent f5662ac331
commit 4f9f2034ed
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/netfilter/xt_qtaguid.c
View File

@@ -1468,6 +1468,8 @@ static void if_tag_stat_update(const char *ifname, uid_t uid,
* - No {0, uid_tag} stats and no {acc_tag, uid_tag} stats.
*/
new_tag_stat = create_if_tag_stat(iface_entry, uid_tag);
if (!new_tag_stat)
goto unlock;
uid_tag_counters = &new_tag_stat->counters;
} else {
uid_tag_counters = &tag_stat_entry->counters;
@@ -1476,6 +1478,8 @@ static void if_tag_stat_update(const char *ifname, uid_t uid,
if (acct_tag) {
/* Create the child {acct_tag, uid_tag} and hook up parent. */
new_tag_stat = create_if_tag_stat(iface_entry, tag);
if (!new_tag_stat)
goto unlock;
new_tag_stat->parent_counters = uid_tag_counters;
} else {
/*
@@ -1489,6 +1493,7 @@ static void if_tag_stat_update(const char *ifname, uid_t uid,
BUG_ON(!new_tag_stat);
}
tag_stat_update(new_tag_stat, direction, proto, bytes);
unlock:
spin_unlock_bh(&iface_entry->tag_stat_list_lock);
}