Received-SPF: pass (google.com: domain of linux-kernel+bounces-14286-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org,
 kernel-janitors@vger.kernel.org, Antonio Quartulli <a@unstable.cc>,
 "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>,
 Jakub Kicinski <kuba@kernel.org>, Marek Lindner <mareklindner@neomailbox.ch>,
 Paolo Abeni <pabeni@redhat.com>, Simon Wunderlich <sw@simonwunderlich.de>,
 Markus Elfring <Markus.Elfring@web.de>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject:
 Re: [PATCH 2/2] batman-adv: Improve exception handling in
 batadv_throw_uevent()
Date: Tue, 02 Jan 2024 12:24:05 +0100
Message-ID: <4889340.31r3eYUQgx@sven-l14>
In-Reply-To: <d2ce9337-e1a4-4213-ad6f-926c085dc17f@web.de>
References:
 <8588cafe-3c61-40a6-b071-0877632a2a1e@web.de>
 <d2ce9337-e1a4-4213-ad6f-926c085dc17f@web.de>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart4538693.LvFx2qVVIh";
 micalg="pgp-sha512"; protocol="application/pgp-signature"

--nextPart4538693.LvFx2qVVIh
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"; protected-headers="v1"
From: Sven Eckelmann <sven@narfation.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Date: Tue, 02 Jan 2024 12:24:05 +0100
Message-ID: <4889340.31r3eYUQgx@sven-l14>
In-Reply-To: <d2ce9337-e1a4-4213-ad6f-926c085dc17f@web.de>
MIME-Version: 1.0

On Tuesday, 2 January 2024 08:12:56 CET Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 2 Jan 2024 07:52:21 +0100
> 
> The kfree() function was called in up to three cases by
> the batadv_throw_uevent() function during error handling
> even if the passed variable contained a null pointer.
> This issue was detected by using the Coccinelle software.
> 
> * Thus adjust jump targets.
> 
> * Reorder kfree() calls at the end.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Acked-by: Sven Eckelmann <sven@narfation.org>

> ---
>  net/batman-adv/main.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
> index 5fc754b0b3f7..75119f1ffccc 100644
> --- a/net/batman-adv/main.c
> +++ b/net/batman-adv/main.c
> @@ -691,29 +691,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
>  				  "%s%s", BATADV_UEV_TYPE_VAR,
>  				  batadv_uev_type_str[type]);
>  	if (!uevent_env[0])
> -		goto out;
> +		goto report_error;
> 
>  	uevent_env[1] = kasprintf(GFP_ATOMIC,
>  				  "%s%s", BATADV_UEV_ACTION_VAR,
>  				  batadv_uev_action_str[action]);
>  	if (!uevent_env[1])
> -		goto out;
> +		goto free_first_env;
> 
>  	/* If the event is DEL, ignore the data field */
>  	if (action != BATADV_UEV_DEL) {
>  		uevent_env[2] = kasprintf(GFP_ATOMIC,
>  					  "%s%s", BATADV_UEV_DATA_VAR, data);
>  		if (!uevent_env[2])
> -			goto out;
> +			goto free_second_env;
>  	}
> 
>  	ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
> -out:
> -	kfree(uevent_env[0]);
> -	kfree(uevent_env[1]);
>  	kfree(uevent_env[2]);
> +free_second_env:
> +	kfree(uevent_env[1]);
> +free_first_env:
> +	kfree(uevent_env[0]);
> 
>  	if (ret)
> +report_error:
>  		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
>  			   "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
>  			   batadv_uev_type_str[type],
> --
> 2.43.0
> 
> 


--nextPart4538693.LvFx2qVVIh
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEF10rh2Elc9zjMuACXYcKB8Eme0YFAmWT8lUACgkQXYcKB8Em
e0ZtIA//eZtvK8xgUCk7KXnL6m/xB/Hnlsa817um4kK3xG+JO1hmlgxNsNJfu0HT
VIP0Ca/QY7GRewIOz2fT60YCffgVQeht30bVdI3D7U6du5/nd6Q3JRzw8WaFuDxo
MBIvVoqtNCK3YNBjKhYILq1X/lmxgvE+4J/1n94/QQWlJ9lgZthE2JWVwbMfDa+Q
USyZI6ftogWsk9TKrt5cgWuQRrps3qtjnHUmgBNFXfWjwsRQUtjWzE960Y6au2tH
fAqTrBW7M18RE+yDKQUjnmlpETnwBLCCcudS2cZBmx9EZL4TQEdJ4T+Ka8e9iPwV
M37MJh/h+mwbxKIhv0vPnuvpBHZzQ+3opNCgIGTpS5YExATFMCIVXMeuN+kjVfC3
X1iHjqRagGxcqpQtzaUcgYsZ4/elr5ODM4GH2VzH5phqb5iS0u64K+lmuWqO/Bsx
hi7klW9+mKcrVgyeM5r83VcP9Ea+wS/3vhQBTPK4X3da71oqPq0X+2/qOYlzreBq
LIpWu9BdpkKp5NHoAL7yyxOfm8hIjGCY1EXWUsKyb9Zs08Etqr4thHJtxxTNzhM1
2ulCCmn8NNK/PzvguYQxIbXiJiK9U7bfzZoKbYSPRTEvd2xM2RxMrgZH94swmFYD
SNNMTa3ccaynMy/E/KB0/uD2ktF1PHs6739YdB6ivv7VIZTKqRI=
=sz9M
-----END PGP SIGNATURE-----

--nextPart4538693.LvFx2qVVIh--