Re: [PATCH] Orphaned expectations

[Patrick McHardy <kaber@trash.net>]

Phil Oester wrote:
> So we need to make sure that expectations don't get orphaned in this way, which
> I believe the below patch will ensure.  Of course it will also stop the
> oops on read of /proc/net/ip_conntrack.

Thanks Phil, I've added this patch to CVS:

@@ -324,8 +324,9 @@
                 ip_conntrack_destroyed(ct);

         WRITE_LOCK(&ip_conntrack_lock);
-       /* Delete us from our own list to prevent corruption later */
-       list_del(&ct->sibling_list);
+       /* Make sure don't leave any orphaned expectations lying around */
+       if (ct->expecting)
+               remove_expectations(ct, 1);

         /* Delete our master expectation */
         if (ct->master) {

Regards,
Patrick