From: JP Abgrall <jpa@google.com>
Date: Wed, 10 Oct 2012 03:38:21 +0000 (-0700)
Subject: netfilter: xt_qtaguid: fix error exit that would keep a spinlock.
X-Git-Tag: firefly_0821_release~4090^2~654
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cb80c2ec451c3beb042bab7aa22a129fa5488121;p=firefly-linux-kernel-4.4.55.git

netfilter: xt_qtaguid: fix error exit that would keep a spinlock.

qtudev_open() could return with a uid_tag_data_tree_lock held
when an kzalloc(..., GFP_ATOMIC) would fail.
Very unlikely to get triggered AND survive the mayhem of running out of mem.

Signed-off-by: JP Abgrall <jpa@google.com>
---

diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index 14b003da1423..6b22563a924f 100644
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -2752,7 +2752,7 @@ static int qtudev_open(struct inode *inode, struct file *file)
 	utd_entry = get_uid_data(current_fsuid(), &utd_entry_found);
 	if (IS_ERR_OR_NULL(utd_entry)) {
 		res = PTR_ERR(utd_entry);
-		goto err;
+		goto err_unlock;
 	}
 
 	/* Look for existing PID based proc_data */
@@ -2794,8 +2794,8 @@ err_unlock_free_utd:
 		rb_erase(&utd_entry->node, &uid_tag_data_tree);
 		kfree(utd_entry);
 	}
+err_unlock:
 	spin_unlock_bh(&uid_tag_data_tree_lock);
-err:
 	return res;
 }