Patrick McHardy wrote:
> diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
> index 0afc298..941b5c3 100644
> --- a/net/netfilter/nf_conntrack_proto.c
> +++ b/net/netfilter/nf_conntrack_proto.c
> @@ -173,7 +173,7 @@ static void nf_ct_l3proto_unregister_sys
>  {
>  #ifdef CONFIG_SYSCTL
>  	mutex_lock(&nf_ct_proto_sysctl_mutex);
> -	if (l3proto->ctl_table != NULL)
> +	if (l3proto->ctl_table_header != NULL)
>  		nf_ct_unregister_sysctl(&l3proto->ctl_table_header,
>  					l3proto->ctl_table, NULL);
>  	mutex_unlock(&nf_ct_proto_sysctl_mutex);
> @@ -260,7 +260,8 @@ static void nf_ct_l4proto_unregister_sys
>  {
>  #ifdef CONFIG_SYSCTL
>  	mutex_lock(&nf_ct_proto_sysctl_mutex);
> -	if (l4proto->ctl_table != NULL)
> +	if (l4proto->ctl_table_header != NULL &&
> +	    *l4proto->ctl_table_header != NULL)
>  		nf_ct_unregister_sysctl(l4proto->ctl_table_header,
>  					l4proto->ctl_table,
>  					l4proto->ctl_table_users);

And a simiar change for the compat stuff, but I've also removed the
double pointer for the header since the compat tables are not supposed
to be shared.