From nobody Fri Mar 25 17:48:56 2022 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 42F061A3731D for ; Fri, 25 Mar 2022 17:49:09 +0000 (UTC) (envelope-from guyyur@gmail.com) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQ8jJ2hfgz3tt1; Fri, 25 Mar 2022 17:49:08 +0000 (UTC) (envelope-from guyyur@gmail.com) Received: by mail-ej1-x62e.google.com with SMTP id qa43so16788395ejc.12; Fri, 25 Mar 2022 10:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=BvnBs8XLlsZuiehn9YJkdeKHZNusIWM0q1dtehcAsRM=; b=StVxafuxUwoG0DW/WscbuvOBIwzRnJel1Ia/tIwuKVA7Gj7utuU7nsWKZtTrHaMsP1 KBtzki+icZAPluL9BMkWe4nAtwu0ztY1vUmFUgQYtYpy4+UOC6HttbsC9hX5Dwv+JKAO Dz9t/U6LDLUNVy2b7r69iWn+473TJe2SciO3QGC4b5SQnHX2bOnyDrnd62XK40X9AzNq vPByW7ac+YsIDypxMcf7EuaNtTKaMPDU9MOTlCOQUo4PP36UpWc1FDQGJAJZN17+qDOc acgHsJ4uphsmWgGkpE4jaRi3uWP4zL3Gvg/1r3LXl3ZDegZPRIOFXIfLYNsom7Bc0Xdu 4Spw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=BvnBs8XLlsZuiehn9YJkdeKHZNusIWM0q1dtehcAsRM=; b=tSqwVd92439e3uTYrCcqk0uXItm4FTWmhOYFCd90bztwwMJ31aBMobYVvUHl5u8hG3 VxECjExtzAzlgHzBcRAOxXuJP5CggR+7ZQUv06zBozsxJ+V9CGDXMN0W8dGI8Kbd8IhK tvK6aHCk0xSmBHLk6P19MFEF+u/J7yKZY2Y5BE6eqDxZ/6OcZCns7tzKYOiVbHXsyOrj iRk7gv0YBDtikdlQ6iz/Rom2nb5/W2GC0wuZgjfuP0bMEHgr2kdXThILY27sVBVTL2Zg x2N1QgoDqyzCGBGLzxCpJ88TVSOeTH2KbwR9w/qzD5oUeIRvHBEIKF0QZ5xTM/SCwdrr FSRw== X-Gm-Message-State: AOAM530r0hpMJOPa7x2C0OILosveWVuJ3n0KuG8zpOGlwO0cHLNtxuzF 7snooEsLs2pKOrCLSt04eP+NhA3508F+brQbfFcUB9ePYqA= X-Google-Smtp-Source: ABdhPJwU/2137DETKDG7M0tW77YoJKfPqaoNf/l0eIEfdxVamssMaxNP/9swnSIrdAKdvMhxw7NJ12G59pJ2SC4Xly8= X-Received: by 2002:a17:906:69c5:b0:6cf:d164:8b32 with SMTP id g5-20020a17090669c500b006cfd1648b32mr13064975ejs.233.1648230547004; Fri, 25 Mar 2022 10:49:07 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Guy Yur Date: Fri, 25 Mar 2022 20:48:56 +0300 Message-ID: Subject: Re: Interrupted fputc followed by fprintf in _IOLBF mode causes core dump To: Mark Johnston Cc: freebsd-current , Konstantin Belousov Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4KQ8jJ2hfgz3tt1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=StVxafux; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of guyyur@gmail.com designates 2a00:1450:4864:20::62e as permitted sender) smtp.mailfrom=guyyur@gmail.com X-Spamd-Result: default: False [-2.26 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.09)[-0.095]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_RHS_MATCH_FROMTLD(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::62e:from]; NEURAL_HAM_SHORT(-0.17)[-0.168]; MLMMJ_DEST(0.00)[freebsd-current]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-ThisMailContainsUnwantedMimeParts: N On Fri, Mar 25, 2022 at 5:50 PM Mark Johnston wrote: > > On Fri, Mar 25, 2022 at 03:18:40PM +0300, Guy Yur wrote: > > Hi, > > > > dhcpcd on head (Mar 24) and 13.1-BETA2 crashes in fprintf/__sfvwrite. > > It doesn't crash if If I revert the __sflush/__sfvwrite commits: > > 86a16ada1ea608408cec370171d9f59353e97c77 and > > bafaa70b6f9098d83d074968c8e6747ecec1e118. > > > > ... > > Thanks for the reproducer. The bug is akin to that fixed by > bafaa70b6f9098d83d074968c8e6747ecec1e118. Could you please verify that > the patch below fixes the original bug? > > commit 11f817e847b2f06bd543d1bd6cfdff53d69842dc > Author: Mark Johnston > Date: Fri Mar 25 10:46:24 2022 -0400 > > libc: Restore fp state upon flush error in fputc > > diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c > index e1aa70243e94..6cd75145a271 100644 > --- a/lib/libc/stdio/wbuf.c > +++ b/lib/libc/stdio/wbuf.c > @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); > int > __swbuf(int c, FILE *fp) > { > + unsigned char *old_p; > int n; > > /* > @@ -87,8 +88,15 @@ __swbuf(int c, FILE *fp) > } > fp->_w--; > *fp->_p++ = c; > - if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) > - if (__fflush(fp)) > + old_p = fp->_p; > + if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) { > + if (__fflush(fp)) { > + if (fp->_p == old_p) { > + fp->_p--; > + fp->_w++; > + } > return (EOF); > + } > + } > return (c); > } Hi, With this patch applied, dhcpcd doesn't crash. Thanks, Guy