linux-kernel - Re: [PATCH net] can: j1939: fix errant alert in j1939_tp

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 10 Sep 2021 14:35:04 +0200
From:   Oleksij Rempel <o.rempel@...gutronix.de>
To:     Ziyang Xuan <william.xuanziyang@...wei.com>
Cc:     robin@...tonic.nl, linux@...pel-privat.de, socketcan@...tkopp.net,
        mkl@...gutronix.de, davem@...emloft.net, kuba@...nel.org,
        linux-can@...r.kernel.org, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH net] can: j1939: fix errant alert in j1939_tp_rxtimer

On Mon, Sep 06, 2021 at 05:42:19PM +0800, Ziyang Xuan wrote:
> When the session state is J1939_SESSION_DONE, j1939_tp_rxtimer() will
> give an alert "rx timeout, send abort", but do nothing actually.
> Move the alert into session active judgment condition, it is more
> reasonable.
> 
> One of the scenarioes is that j1939_tp_rxtimer() execute followed by
> j1939_xtp_rx_abort_one(). After j1939_xtp_rx_abort_one(), the session
> state is J1939_SESSION_DONE, then j1939_tp_rxtimer() give an alert.
> 
> Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
> Signed-off-by: Ziyang Xuan <william.xuanziyang@...wei.com>

Acked-by: Oleksij Rempel <o.rempel@...gutronix.de>

Thank you!

> ---
>  net/can/j1939/transport.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
> index 0f8309314075..d3f0a062b400 100644
> --- a/net/can/j1939/transport.c
> +++ b/net/can/j1939/transport.c
> @@ -1226,12 +1226,11 @@ static enum hrtimer_restart j1939_tp_rxtimer(struct hrtimer *hrtimer)
>  		session->err = -ETIME;
>  		j1939_session_deactivate(session);
>  	} else {
> -		netdev_alert(priv->ndev, "%s: 0x%p: rx timeout, send abort\n",
> -			     __func__, session);
> -
>  		j1939_session_list_lock(session->priv);
>  		if (session->state >= J1939_SESSION_ACTIVE &&
>  		    session->state < J1939_SESSION_ACTIVE_MAX) {
> +			netdev_alert(priv->ndev, "%s: 0x%p: rx timeout, send abort\n",
> +				     __func__, session);
>  			j1939_session_get(session);
>  			hrtimer_start(&session->rxtimer,
>  				      ms_to_ktime(J1939_XTP_ABORT_TIMEOUT_MS),
> -- 
> 2.25.1
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |