diff options
author | Amit Pundir <amit.pundir@linaro.org> | 2018-07-19 22:06:06 +0530 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2018-07-19 22:08:41 +0530 |
commit | e2df7f1153f05733f6a00d0bc5756828ed9f7253 (patch) | |
tree | 5a78908887e137863c2d3f8c44a50880bd9a9814 /net/netfilter/xt_qtaguid.c | |
parent | 9cffeb019816c7ab0fa608f87206284fc9d456c0 (diff) | |
parent | 47bbcd6bf8f926e4e009c12b18f349ffa41bafd4 (diff) |
Merge remote branch 'aosp/android-4.9' into linux-linaro-lsk-v4.9-androidlsk-v4.9-18.09-androidlsk-v4.9-18.07-android
git remote aosp --> https://android.googlesource.com/kernel/common
* aosp/android-4.9:
ANDROID: Fix massive cpufreq_times memory leaks
ANDROID: Reduce use of #ifdef CONFIG_CPU_FREQ_TIMES
UPSTREAM: binder: replace "%p" with "%pK"
UPSTREAM: binder: free memory on error
UPSTREAM: binder: fix proc->files use-after-free
UPSTREAM: Revert "FROMLIST: binder: fix proc->files use-after-free"
UPSTREAM: ANDROID: binder: change down_write to down_read
UPSTREAM: ANDROID: binder: correct the cmd print for BINDER_WORK_RETURN_ERROR
UPSTREAM: ANDROID: binder: remove 32-bit binder interface.
UPSTREAM: ANDROID: binder: re-order some conditions
UPSTREAM: android: binder: use VM_ALLOC to get vm area
UPSTREAM: android: binder: Use true and false for boolean values
UPSTREAM: android: binder: Use octal permissions
UPSTREAM: android: binder: Prefer __func__ to using hardcoded function name
UPSTREAM: ANDROID: binder: make binder_alloc_new_buf_locked static and indent its arguments
UPSTREAM: android: binder: Check for errors in binder_alloc_shrinker_init().
ANDROID: Add kconfig to make dm-verity check_at_most_once default enabled
ANDROID: xt_qtaguid: Remove unnecessary null checks to device's name
UPSTREAM: cpufreq: schedutil: use now as reference when aggregating shared policy requests
ANDROID: sdcardfs: fix potential crash when reserved_mb is not zero
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'net/netfilter/xt_qtaguid.c')
-rw-r--r-- | net/netfilter/xt_qtaguid.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c index 3dfa5a000853..d6779099d453 100644 --- a/net/netfilter/xt_qtaguid.c +++ b/net/netfilter/xt_qtaguid.c @@ -1191,11 +1191,6 @@ static void get_dev_and_dir(const struct sk_buff *skb, par->hooknum, __func__); BUG(); } - if (unlikely(!(*el_dev)->name)) { - pr_err("qtaguid[%d]: %s(): no dev->name?!!\n", - par->hooknum, __func__); - BUG(); - } if (skb->dev && *el_dev != skb->dev) { MT_DEBUG("qtaguid[%d]: skb->dev=%p %s vs par->%s=%p %s\n", par->hooknum, skb->dev, skb->dev->name, |