From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 1 Feb 2013 17:34:55 +0100 From: Pablo Neira Ayuso To: Feng Gao Cc: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [ 82/89] netfilter: xt_hashlimit: fix race that results in duplicated entries Message-ID: <20130201163455.GB4908@localhost> References: <20130201130207.444989281@linuxfoundation.org> <20130201130213.388508268@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: On Fri, Feb 01, 2013 at 11:04:36PM +0800, Feng Gao wrote: > Hi Greg, > I have a question. > There are two duplicated lines now. > dh->expires = now + > msecs_to_jiffies(hinfo->cfg.expire); > rateinfo_recalc(dh, now, hinfo->cfg.mode); > 1# case: The dsthash_find return a valid dh; > 2# case: There is a race. The race is true. > Why we could not adopt the method I sent before. > dh = dsthash_find(hinfo, &dst); > if (dh == NULL) { > dh = dsthash_alloc_init(hinfo, &dst, &new_node); > if (dh == NULL) { > rcu_read_unlock_bh(); > goto hotdrop; > } > } > if (new_node) { > dh->expires = jiffies + msecs_to_jiffies(hinfo->cfg.expire); > rateinfo_init(dh, hinfo); > } else { > /* update expiration timeout */ > dh->expires = now + msecs_to_jiffies(hinfo->cfg.expire); > rateinfo_recalc(dh, now, hinfo->cfg.mode); > } > I think it could avoid the two duplicated lines. That's a cleanup, send me a follow up patch for that if you want. Greg, please, don't back down this patch, it's fixing a real problem. Gao is proposing some code refactoring to save line a couple of lines of code.