diff --git a/[refs] b/[refs]
index e0cfba6a8c12..e032e571b2eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 442fad9423b78319e0019a7f5047eddf3317afbc
+refs/heads/master: 6e2f0aa8cf8892868bf2c19349cb5d7c407f690d
diff --git a/trunk/net/netfilter/nf_conntrack_helper.c b/trunk/net/netfilter/nf_conntrack_helper.c
index 884f2b39319a..91527d5ba018 100644
--- a/trunk/net/netfilter/nf_conntrack_helper.c
+++ b/trunk/net/netfilter/nf_conntrack_helper.c
@@ -236,7 +236,9 @@ int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,
 		/* We only allow helper re-assignment of the same sort since
 		 * we cannot reallocate the helper extension area.
 		 */
-		if (help->helper != helper) {
+		struct nf_conntrack_helper *tmp = rcu_dereference(help->helper);
+
+		if (tmp && tmp->help != helper->help) {
 			RCU_INIT_POINTER(help->helper, NULL);
 			goto out;
 		}