From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 419EF4071DA; Sun, 7 Jun 2026 10:15:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780827341; cv=none; b=IkPivBJ6cypTAXycpwERtbOLYRudds5YBKxg4n6NnwmCpujPtu6S8oFixhqizu98FFJahyztGgOeFFyJfNdh/4memuLDqmP7lFvudbwWX8f+KaPubMEjyDmZCaNtjnT6Ki7ZxKsIop6KZhv2GguGcFqLzI5m04wbWJz6lZl4ZRA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780827341; c=relaxed/simple; bh=vwhQg/8Ws9eKLY8EadxW/Qe8PbO323DiL4omMdcH5Zw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tY90jT+vbZQksogR4gzu9V2XoBI/SdINLqTrZwe0WurENQqlhwR+eq9Dsx+ywFZCEeymFQOaG7X8Na/Hz4s2Gmr5URmbw+P5MIeSYeP35vwHLHBsFub7YmuIhK4/eySCmygmcdYGZ1eytInf7U0KXGxvJmwB0uDZT6t6tWleWJ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2o3VJOuT; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="2o3VJOuT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 842BB1F00893; Sun, 7 Jun 2026 10:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780827340; bh=oKD7766u/iJlY+w7GaUMbL7SqkKs/6OfrBdjuA30Tws=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=2o3VJOuTxSCxO2Jk7eVl76hpnefn/y0IvoprRsmEgJSNo4lWqosUO0vjZgIpBH9h1 DhwlbIdiG2ofcdbzaNzx+iwDE9W9yQN3wIXeHWmmFIgKm+dqUquCrUE88VNyu3LtHF iWDGui4kwZXK6IVl5lDE5oQvZTKRVBUWkA2qudNk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vadim Fedorenko , Kory Maincent , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 065/315] ethtool: tsconfig: fix reply error handling Date: Sun, 7 Jun 2026 11:57:32 +0200 Message-ID: <20260607095729.999068356@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260607095727.528828913@linuxfoundation.org> References: <20260607095727.528828913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jakub Kicinski [ Upstream commit a888bbd43940cada72f7686337741ce86d1cf869 ] A couple of trivial bugs in error handling in tsconfig_send_reply(). If we failed to allocate rskb we need to set the error. If we did allocate it but failed to send it - we need to remember to free it. Fixes: 6e9e2eed4f39 ("net: ethtool: Add support for tsconfig command to get/set hwtstamp config") Reviewed-by: Vadim Fedorenko Reviewed-by: Kory Maincent Link: https://patch.msgid.link/20260526153533.2779187-3-kuba@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ethtool/tsconfig.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/ethtool/tsconfig.c b/net/ethtool/tsconfig.c index 169b413b31fc5f..041de8687472bd 100644 --- a/net/ethtool/tsconfig.c +++ b/net/ethtool/tsconfig.c @@ -224,16 +224,21 @@ static int tsconfig_send_reply(struct net_device *dev, struct genl_info *info) reply_len = ret + ethnl_reply_header_size(); rskb = ethnl_reply_init(reply_len, dev, ETHTOOL_MSG_TSCONFIG_SET_REPLY, ETHTOOL_A_TSCONFIG_HEADER, info, &reply_payload); - if (!rskb) + if (!rskb) { + ret = -ENOMEM; goto err_cleanup; + } ret = tsconfig_fill_reply(rskb, &req_info->base, &reply_data->base); if (ret < 0) - goto err_cleanup; + goto err_free_msg; genlmsg_end(rskb, reply_payload); ret = genlmsg_reply(rskb, info); + rskb = NULL; +err_free_msg: + nlmsg_free(rskb); err_cleanup: kfree(reply_data); kfree(req_info); -- 2.53.0