From owner-svn-src-head@freebsd.org Mon Oct 2 11:12:27 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8008E3CB63; Mon, 2 Oct 2017 11:12:27 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: from mail-wr0-x233.google.com (mail-wr0-x233.google.com [IPv6:2a00:1450:400c:c0c::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A7B0639B9; Mon, 2 Oct 2017 11:12:27 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: by mail-wr0-x233.google.com with SMTP id y95so3620036wrb.4; Mon, 02 Oct 2017 04:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=NslUVxkCt0CHsMCHgfgqvwR0AFTf+K0a/EwLN3RKiic=; b=ja9Zta1oTypEmsgn3PaA02eJ9WqqriQuomTDcFLG+aul3dEEYgh4+75wYgj5vrUgiQ /LH7+L446V+2dPOTyUXySXaMNzV/HIOPfp3TNFvlBIiFFvuTmhbPqpu60xcMekrm27k0 2Lt9Z7dnm80EOcwjaDxCkTyBpvtqd6RNbIORUoRXezSxqGZgyU4xbL4Jr+yukr5AEeL2 ENyJpBMEON/0XZ9mXMnQe3ze5bK8qpWypb/YsDvRzv2MqHvdOGLw2dVuweZdSBJYepK9 jAiQHfITWnum146I3CdfwJcFVrz/jLaRv4sJ/UroqMOChPlAXTyXJZRms6nklEV/pL20 F6RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=NslUVxkCt0CHsMCHgfgqvwR0AFTf+K0a/EwLN3RKiic=; b=T2yUcuUGNvZ35tYXMSmt+DGOJR2wroNUmjiKk5TsmhQuH21FZbqkFr5yEjPHhoWnjB h9dWRfWkCmwtSTm833t3k92l+mHdXo/yyX9wi+H2FXvnMOT+qZm8MXGGkh1WDlnZYE/b RQbjVOVQIoJbZS1JUtcCMa+XOae9scZqdYbKBICkeGPTqGDKbhRz67cOgpKb2nHaSFWC GDZ4HuMMOi5qUD4V/g2V+4mUCQRpArzzI258gF+iP0eFUp9rSnjObtdxQuwxCUs4HYbA Egs84FgpIMnjiCL25RCgDdx6C8wPQMRpX8yeJCKN8qHGx39ZLKz1eHn+9C90RLgLLqSr g++A== X-Gm-Message-State: AHPjjUg1pGPgBr+xOotnJQPA5vp4OTbwwMYEHD/Eo0B24QPyKaztZJ6D 52vSWEZ+U+gnKe2i7au7Qc745g== X-Google-Smtp-Source: AOwi7QCQ5QTAsNoweSg/zm/MpHlmXNGlWKteNSpt8dr9QoG46XAqDpcjKbN+oEZREZMD2Igo+Nqh3w== X-Received: by 10.223.145.5 with SMTP id j5mr13666010wrj.114.1506942745634; Mon, 02 Oct 2017 04:12:25 -0700 (PDT) Received: from ernst.home (p578E321D.dip0.t-ipconnect.de. [87.142.50.29]) by smtp.gmail.com with ESMTPSA id f11sm308305wra.79.2017.10.02.04.12.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2017 04:12:24 -0700 (PDT) Date: Mon, 2 Oct 2017 13:12:18 +0200 From: Gary Jennejohn To: Julien Charbon Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r324179 - head/sys/netinet Message-ID: <20171002131218.3160093f@ernst.home> In-Reply-To: <201710012120.v91LKSH1050145@repo.freebsd.org> References: <201710012120.v91LKSH1050145@repo.freebsd.org> Reply-To: gljennjohn@gmail.com X-Mailer: Claws Mail 3.15.1 (GTK+ 2.24.31; amd64-portbld-freebsd12.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Oct 2017 11:12:28 -0000 On Sun, 1 Oct 2017 21:20:28 +0000 (UTC) Julien Charbon wrote: > Author: jch > Date: Sun Oct 1 21:20:28 2017 > New Revision: 324179 > URL: https://svnweb.freebsd.org/changeset/base/324179 > > Log: > Fix an infinite loop in tcp_tw_2msl_scan() when an INP_TIMEWAIT inp has > been destroyed before its tcptw with INVARIANTS undefined. > > This is a symmetric change of r307551: > > A INP_TIMEWAIT inp should not be destroyed before its tcptw, and INVARIANTS > will catch this case. If INVARIANTS is undefined it will emit a log(LOG_ERR) > and avoid a hard to debug infinite loop in tcp_tw_2msl_scan(). > > Reported by: Ben Rubson, hselasky > Submitted by: hselasky > Tested by: Ben Rubson, jch > MFC after: 1 week > Sponsored by: Verisign, inc > Differential Revision: https://reviews.freebsd.org/D12267 > > Modified: > head/sys/netinet/tcp_timewait.c > > Modified: head/sys/netinet/tcp_timewait.c > ============================================================================== > --- head/sys/netinet/tcp_timewait.c Sun Oct 1 20:12:30 2017 (r324178) > +++ head/sys/netinet/tcp_timewait.c Sun Oct 1 21:20:28 2017 (r324179) > @@ -709,10 +709,29 @@ tcp_tw_2msl_scan(int reuse) > INP_WLOCK(inp); > tw = intotw(inp); > if (in_pcbrele_wlocked(inp)) { > - KASSERT(tw == NULL, ("%s: held last inp " > - "reference but tw not NULL", __func__)); > - INP_INFO_RUNLOCK(&V_tcbinfo); > - continue; > + if (__predict_true(tw == NULL)) { > + INP_INFO_RUNLOCK(&V_tcbinfo); > + continue; > + } else { > + /* This should not happen as in TIMEWAIT > + * state the inp should not be destroyed > + * before its tcptw. If INVARIANTS is > + * defined panic. > + */ > +#ifdef INVARIANTS > + panic("%s: Panic before an infinite " > + "loop: INP_TIMEWAIT && (INP_FREED " > + "|| inp last reference) && tw != " > + "NULL", __func__); > +#else > + log(LOG_ERR, "%s: Avoid an infinite " > + "loop: INP_TIMEWAIT && (INP_FREED " > + "|| inp last reference) && tw != " > + "NULL", __func__); > +#endif > + INP_INFO_RUNLOCK(&V_tcbinfo); > + break; > + } > } > > if (tw == NULL) { > This file needs to include sys/syslog.h, otherwise LOG_ERR is not defined and the kernel build fails when INVARIANTS is not defined in the kernel config file. -- Gary Jennejohn