Commit c3fc9976 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

ethtool: tsinfo: don't pass ERR_PTR to genlmsg_cancel on prepare failure 



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: b9e3f7dc ("net: ethtool: tsinfo: Enhance tsinfo to support several hwtstamp by net topology")
Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarKory Maincent <kory.maincent@bootlin.com>
Link: https://patch.msgid.link/20260526153533.2779187-8-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1de40569

net/ethtool/tsinfo.c

+2 −4
Original line number Diff line number Diff line
@@ -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);