From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB5D9410D06 for ; Tue, 26 May 2026 17:47:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779817628; cv=none; b=EXRF1RMfGK49BRKM29+CYMUpO86BDV7u3qmgGNSIqxFR9fDHYVki++BTjWWdcBvRUut44vJvo6+Q4Xsk5Gr3L+7Q/dYcWMwfGWQHpMuu2Ewo6IIeN3VSttFZ1vTdVzvWNUlGvP42PumJsLWO8og76munyWEg1OQY5NOb/sQaP0A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779817628; c=relaxed/simple; bh=TLesoEoiCAfLI3uupikvinn+TFASbXk8rqOJGh9e1VY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Rjm4KZBj/5VEhSvehDKOO2J49gpUNi5D6OiUHDtnfFLupkBUEihwF/FKiDh6GtUR6dkH6r9QYtikgdrK7kkuqsJ2k0Dj8ZNFMqMKDu2yguTIEUalB9yxZNjDMvn27rOTSIZ4HX7guHgBdC8MuqTQl6eZkOk0KAnHnN0cX6G4tUA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=MmZqekZv; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="MmZqekZv" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id A0A91C79ABF; Tue, 26 May 2026 17:47:03 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 0D4646011D; Tue, 26 May 2026 17:47:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 737FF108889E1; Tue, 26 May 2026 19:46:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1779817623; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:content-language:in-reply-to:references; bh=quOHQzwdS+5HN7n9+dcVJkNaXla1ATVSNcbbILKyics=; b=MmZqekZvnQEjHCa2I/3jqxF4a7UwFtcr7hNhpsD9WBHqc9Q4jK99pUg2O7EdZJDBFByFO/ TeM9iuDbPzhdLHLFAN6JL4g4gWWhCKXBcSp/AuByDy892dZOfz66HOCh+q6Dh+rlvTxyiH 4d+A4DnjpbJKCjE5DuKKgS35/c9FbuAsmqsQXyk/Tm1Zl6Rzt9mutDoPUOutlso7OMOBET Bh1fjaADzWehAIUCQ9G7mtHNuSuro/HjRCsyDjjTCiWkRqvXj4CrX6Df7uya/nE86MciY1 9tNjthmMp4rjp4dgcfggnL67n4hBdwyyDwFILejACHw3FFLOcKmteNDNR0/yFQ== Message-ID: Date: Tue, 26 May 2026 19:46:58 +0200 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net 07/10] ethtool: tsinfo: don't pass ERR_PTR to genlmsg_cancel on prepare failure To: Jakub Kicinski , davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, o.rempel@pengutronix.de, kory.maincent@bootlin.com, haiyangz@microsoft.com, andrew@lunn.ch References: <20260526153533.2779187-1-kuba@kernel.org> <20260526153533.2779187-8-kuba@kernel.org> Content-Language: en-US From: Maxime Chevallier In-Reply-To: <20260526153533.2779187-8-kuba@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Last-TLS-Session-Version: TLSv1.3 Hi, On 5/26/26 17:35, Jakub Kicinski wrote: > The goto err label leads to: > > genlmsg_cancel(skb, ehdr); > return ret; > > If ethnl_tsinfo_prepare_dump() failed, it has not started a genlmsg. > There's nothing to cancel, and passing an error pointer to > genlmsg_cancel() would cause a crash. > > Fixes: b9e3f7dc9ed9 ("net: ethtool: tsinfo: Enhance tsinfo to support several hwtstamp by net topology") > Signed-off-by: Jakub Kicinski Reviewed-by: Maxime Chevallier Maxime > --- > CC: andrew@lunn.ch > CC: maxime.chevallier@bootlin.com > CC: kory.maincent@bootlin.com > --- > net/ethtool/tsinfo.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/net/ethtool/tsinfo.c b/net/ethtool/tsinfo.c > index f54fe6b662b2..14bf01e3b55c 100644 > --- a/net/ethtool/tsinfo.c > +++ b/net/ethtool/tsinfo.c > @@ -407,10 +407,8 @@ static int ethnl_tsinfo_dump_one_netdev(struct sk_buff *skb, > continue; > > ehdr = ethnl_tsinfo_prepare_dump(skb, dev, reply_data, cb); > - if (IS_ERR(ehdr)) { > - ret = PTR_ERR(ehdr); > - goto err; > - } > + if (IS_ERR(ehdr)) > + return PTR_ERR(ehdr); > > reply_data->ts_info.phc_qualifier = ctx->pos_phcqualifier; > ret = ops->get_ts_info(dev, &reply_data->ts_info);