From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dvalin.narfation.org (dvalin.narfation.org [213.160.73.56]) (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 1E6153C3C10 for ; Tue, 28 Jul 2026 07:04:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.160.73.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785222298; cv=none; b=qmAok7rSGPyvsA68TonrLl65DPzUOTY17mf/qygEedSLBSxbII5FuWYgo+2+/vFXLSo7wLeudn1otGoxQjbN9l9SyOWw3vGI9fkuq8KHIHi/8WuNqwylB0fuyySMLgaPJySkEYWe6gabpdLL+kHjsnven+ImTf1PwKHBmBAegRY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785222298; c=relaxed/simple; bh=PS/1iUEnwt0v6KQu7h0qkDEFXtrpEJ5pbQCMd/8RlfQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Hb5Qgf761TEOKQa5UwmuuhUumQbZU8T35WyPBu3xkDodsTIV6Y8HLvcAw6Bsp73L+4tFdE3Hc69oXZSeA2w+UdmOP3m57+v8zN3W83Feud/tcBJ2iMnEAsKvznL4wZt+YufIAjl8tmAg7/SRBlGdQtxwqR4p4cBxUx/Ml0sV06U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=narfation.org; spf=pass smtp.mailfrom=narfation.org; dkim=pass (1024-bit key) header.d=narfation.org header.i=@narfation.org header.b=dhf4Qw09; arc=none smtp.client-ip=213.160.73.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=narfation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=narfation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=narfation.org header.i=@narfation.org header.b="dhf4Qw09" Received: by dvalin.narfation.org (Postfix) id 4122C200C7; Tue, 28 Jul 2026 07:04:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=narfation.org; s=20121; t=1785222284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=u7jacpBXpBTqofCgNjTjUOYN4l08CWb2DrfC5FriODs=; b=dhf4Qw09Om4JWfmLM2aJiBNGyMgzcruX8el0QiaxxbpLBgQNMkCnvl7DZRqhCGiq40A4kK UAAnFq0PA1snxHvlF3WEhUqgIWOxGoLp4RWUS6PvxpKYsKGdzQZGVGv94OXK5MvrJayvvZ vbjM8/qT0EhXbu4kaYmRfCUXEHOlkE4= From: Sven Eckelmann To: Marek Lindner , Simon Wunderlich , Antonio Quartulli , b.a.t.m.a.n@lists.open-mesh.org, Minhong He Cc: linux-kernel@vger.kernel.org, Markus Pargmann , Aditya Pakki , Artem Chernyshev Subject: Re: [PATCH net] batman-adv: check register_netdevice_notifier() and rtnl_link_register() errors Date: Tue, 28 Jul 2026 09:04:37 +0200 Message-ID: <14518281.RDIVbhacDa@sven-l14> In-Reply-To: <20260728031050.76643-1-heminhong@kylinos.cn> References: <20260728031050.76643-1-heminhong@kylinos.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart14061147.dW097sEU6C"; micalg="pgp-sha512"; protocol="application/pgp-signature" --nextPart14061147.dW097sEU6C Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Sven Eckelmann Date: Tue, 28 Jul 2026 09:04:37 +0200 Message-ID: <14518281.RDIVbhacDa@sven-l14> In-Reply-To: <20260728031050.76643-1-heminhong@kylinos.cn> References: <20260728031050.76643-1-heminhong@kylinos.cn> MIME-Version: 1.0 On Tuesday, 28 July 2026 05:10:50 CEST Minhong He wrote: > batadv_init() ignores errors from register_netdevice_notifier() and > rtnl_link_register(), so the module can load without those registrations > in place. > > Check both return values and unwind prior initialization in reverse order > of acquisition on failure. > > Signed-off-by: Minhong He > --- > net/batman-adv/main.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) This is not for the net tree/repo. So please don't mark it as such. You must target the batadv tree/repo. > > diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c > index 73becb054948..e6bcaf2d14ed 100644 > --- a/net/batman-adv/main.c > +++ b/net/batman-adv/main.c > @@ -108,8 +108,14 @@ static int __init batadv_init(void) > if (ret < 0) > goto err_init_wifi; > > - register_netdevice_notifier(&batadv_hard_if_notifier); > - rtnl_link_register(&batadv_link_ops); > + ret = register_netdevice_notifier(&batadv_hard_if_notifier); > + if (ret < 0) > + goto err_reg_notifier; > + > + ret = rtnl_link_register(&batadv_link_ops); > + if (ret < 0) > + goto err_rtnl_link; > + > batadv_netlink_register(); You missed the error handling for: * batadv_netlink_register() - doesn't require a cleanup call now but it would be batadv_netlink_unregister() - the error must be returned from this function * batadv_iv_init() - no special cleanup call - but if you want to add one, please add a deinit wrapper around batadv_recv_handler_unregister(BATADV_IV_OGM); in bat_iv_ogm.c * batadv_v_init() - no special cleanup call - but if you want to add one, please add a deinit wrapper around batadv_recv_handler_unregister(BATADV_OGM2); batadv_recv_handler_unregister(BATADV_ELP); in bat_v.c and make sure you have a dummy variant in bat_v.h And please adjust the subject to something which doesn't list all the new things you check for errors. > > pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n", > @@ -117,6 +123,10 @@ static int __init batadv_init(void) > > return 0; > > +err_rtnl_link: > + unregister_netdevice_notifier(&batadv_hard_if_notifier); > +err_reg_notifier: > + batadv_wifi_net_devices_deinit(); There must be an rcu_barrier() before batadv_wifi_net_devices_deinit(). > err_init_wifi: > destroy_workqueue(batadv_event_workqueue); > batadv_event_workqueue = NULL; > See: * https://patchwork.open-mesh.org/project/b.a.t.m.a.n./patch/1419594103-10928-6-git-send-email-mpa@pengutronix.de/ * https://patchwork.open-mesh.org/project/b.a.t.m.a.n./patch/20181224174926.20321-1-pakki001@umn.edu/ * https://patchwork.open-mesh.org/project/b.a.t.m.a.n./patch/20221224233311.48678-1-artem.chernyshev@red-soft.ru/ Regards, Sven --nextPart14061147.dW097sEU6C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQS81G/PswftH/OW8cVND3cr0xT1ywUCamhUhQAKCRBND3cr0xT1 y9xPAP0TcOwhSmzGpyEm/Y0L2luIuJwREfWzXXhBYoGRrXsClgEA04aThrUmH4Vl rUZiwjTomCo/LIw96MOl/rpIf4YM/QI= =nCo3 -----END PGP SIGNATURE----- --nextPart14061147.dW097sEU6C--