Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1764085ybz; Thu, 16 Apr 2020 15:16:02 -0700 (PDT) X-Google-Smtp-Source: APiQypLDmHyVSLH1aKSVjoqKHs6I4ddGFlML1J+vXpxRH6Z9FuYexrCY5bhNKMqSAR9oCamYFl6m X-Received: by 2002:a05:6402:1543:: with SMTP id p3mr326245edx.333.1587075362152; Thu, 16 Apr 2020 15:16:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587075362; cv=none; d=google.com; s=arc-20160816; b=CRX2u4Zsk3FwQu9U+C2hhBNrbRL5IEQ0qdPAntMqXcxq6i1UNcHPjN2cEMfBgRriiq /yn8fZVcqtO8pzZ352TWnSQHlFtBetrxxB1HOnSNAlAoaJ063nyN83azwAlkb55q1zze 2xTGH/UHMpefmVmihVeKn92wDcscFR2yHmvsUCf5Nwshk1zl44vrnPFW9TA5Nz6+qRyf +U6t6EfOvRhNnDecYwc/FY7y8HIyi8lZQca4WoFW7bs9L56FgesmJhRH4XkyqpOt/27h EWJUiv0nZ658C4QpZWasQIMkpE4ANDXjUckIgjdUo+4fiGteGOdgDjAr9bx3f36l0O6v jeKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4OxCShMxoBkyTARdyRfwWjsLCX6SU21zMGduOuDHhaM=; b=T8vtSZVuVusFFNcN4CTGMbUuczW8PklUagV9rrmNY0obRVRJZm1x0m7r0rg80wMsP5 /p19QtAzdq5Ok+96G1Q8Pgc+mP4sZIwLxSFj3x+Q1Z/CXG1YEyJ7iltWakgVSZhkeNK1 Dtk4AOw5HvTqe5Ykihi1QngvB7ntKbr3B2nWoFJPqA0cK8587kicNO9piGlBFZoTPHoj kmhagxdhzZCWnu55MDnpcmopSeMud4UENM3i1VgQDY4wff8BQfP5ekyD/Bpc5w7sL2Ek dgkDFeQWyWMfIYj5+sKzos9Ubqdyvhcy24uCP/2IJlSbY2ofLBX2H6qwmDlbNsenlbon IvbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aVQWMFK7; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bi21si14404566edb.547.2020.04.16.15.15.14; Thu, 16 Apr 2020 15:16:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aVQWMFK7; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729187AbgDPWPE (ORCPT + 99 others); Thu, 16 Apr 2020 18:15:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:54222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729197AbgDPWPD (ORCPT ); Thu, 16 Apr 2020 18:15:03 -0400 Received: from localhost.localdomain (c-68-36-133-222.hsd1.mi.comcast.net [68.36.133.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B3D982222D; Thu, 16 Apr 2020 22:15:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587075303; bh=L9CuUF9Eo7o6IB4MaJhkwj9cQWCykiYgn3y2kq3cvk0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aVQWMFK7F8fCTBEprh63MlAN7vA3Jw2r/YgFA7Wiy7sJ8kXsoa8Kz53bppO4Sgz3h 5te1SjBx+uewiNg2SIZyNValIhtJrF+rDtjMTkoM4ZHzyRg7f4TFYc/XJhOf9Mv25S bGUVvtz8hL7Sstfad/3GJLOKKiIc6lL2AT1qm/r8= From: trondmy@kernel.org To: Steve Dickson Cc: linux-nfs@vger.kernel.org Subject: [PATCH 5/7] mountd: Ensure dump_to_cache() sets errno appropriately Date: Thu, 16 Apr 2020 18:12:50 -0400 Message-Id: <20200416221252.82102-6-trondmy@kernel.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200416221252.82102-5-trondmy@kernel.org> References: <20200416221252.82102-1-trondmy@kernel.org> <20200416221252.82102-2-trondmy@kernel.org> <20200416221252.82102-3-trondmy@kernel.org> <20200416221252.82102-4-trondmy@kernel.org> <20200416221252.82102-5-trondmy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust cache_write() will set errno if it returns -1, so that callers can handle errors appropriately, however dump_to_cache() needs to do so too. Signed-off-by: Trond Myklebust --- utils/mountd/cache.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index 94e9e44b46b9..0f323226b12a 100644 --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c @@ -936,12 +936,13 @@ static void write_secinfo(char **bp, int *blen, struct exportent *ep, int flag_m } -static int dump_to_cache(int f, char *buf, int buflen, char *domain, +static int dump_to_cache(int f, char *buf, int blen, char *domain, char *path, struct exportent *exp, int ttl) { char *bp = buf; - int blen = buflen; time_t now = time(0); + size_t buflen; + ssize_t err; if (ttl <= 1) ttl = DEFAULT_TTL; @@ -974,8 +975,18 @@ static int dump_to_cache(int f, char *buf, int buflen, char *domain, } else qword_adduint(&bp, &blen, now + ttl); qword_addeol(&bp, &blen); - if (blen <= 0) return -1; - if (cache_write(f, buf, bp - buf) != bp - buf) return -1; + if (blen <= 0) { + errno = ENOBUFS; + return -1; + } + buflen = bp - buf; + err = cache_write(f, buf, buflen); + if (err < 0) + return err; + if ((size_t)err != buflen) { + errno = ENOSPC; + return -1; + } return 0; } -- 2.25.2