From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 0B87F1EE026 for ; Tue, 7 Jan 2025 13:48:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736257713; cv=none; b=ES7eNxgarnhQTeotN+Ody5bYCMhEeEnCTe2OElj4fqc041HNxG4R8wD8segKDBV9x7nG5YowuJSKR9lBsY+5k9ObV78xTT4TjD0poOu+2nuZx3Mk02WMjWTiSM307qSTnhQOzRWGkgvTtTsINFlRCYshHdMq58aQc1JMWZ8pbj4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736257713; c=relaxed/simple; bh=cvLDMvZ9dRo7Bgr4jycM32wtYh+oNlLa6C42KkZo/TU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Do/VwoB1U8f/2K9Bb+4ZUO/pDAw6ON8ISdMblpqKncc8GsKikV9iuCPf/RnTsuFSuUj1cP10tSGsUXrJDOAHc1qxDe1TqmJKXbb6lTh8m2k2IAYkqPu0bAZaz0xv6za+i8YqhWUddU0DfxbRtE/UCPHsfi1I9/IACtI/9/YQmvA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tV9wR-0004Z7-9m; Tue, 07 Jan 2025 14:48:19 +0100 Received: from moin.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::7b] helo=bjornoya.blackshift.org) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tV9wP-007M20-1L; Tue, 07 Jan 2025 14:48:18 +0100 Received: from pengutronix.de (pd9e59fec.dip0.t-ipconnect.de [217.229.159.236]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mkl-all@blackshift.org) by smtp.blackshift.org (Postfix) with ESMTPSA id C8E4A3A0954; Tue, 07 Jan 2025 13:48:17 +0000 (UTC) Date: Tue, 7 Jan 2025 14:48:17 +0100 From: Marc Kleine-Budde To: Alexander =?utf-8?B?SMO2bHps?= Cc: robin@protonic.nl, socketcan@hartkopp.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, corbet@lwn.net, kernel@pengutronix.de, linux-can@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] j1939: fix unable to send messages with data length zero Message-ID: <20250107-conscious-daring-lemming-c63aa8-mkl@pengutronix.de> References: <20250107133217.119646-1-alexander.hoelzl@gmx.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="vxpme32c2iydzg67" Content-Disposition: inline In-Reply-To: <20250107133217.119646-1-alexander.hoelzl@gmx.net> X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org --vxpme32c2iydzg67 Content-Type: text/plain; protected-headers=v1; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: [PATCH] j1939: fix unable to send messages with data length zero MIME-Version: 1.0 On 07.01.2025 14:32:17, Alexander H=C3=B6lzl wrote: > The J1939 standard requires the transmission of messages of length 0. > For example the proprietary messages are specified with a data length > of 0 to 1785. The transmission of such messages was not possible. > Sending such a message resulted in no error being returned but no > corresponding can frame being generated. What does your patch do? Please describe it here. Marc > Signed-off-by: Alexander H=C3=B6lzl > --- > net/can/j1939/socket.c | 4 ++-- > net/can/j1939/transport.c | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) >=20 > diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c > index 305dd72c844c..17226b2341d0 100644 > --- a/net/can/j1939/socket.c > +++ b/net/can/j1939/socket.c > @@ -1132,7 +1132,7 @@ static int j1939_sk_send_loop(struct j1939_priv *pr= iv, struct sock *sk, >=20 > todo_size =3D size; >=20 > - while (todo_size) { > + do { > struct j1939_sk_buff_cb *skcb; >=20 > segment_size =3D min_t(size_t, J1939_MAX_TP_PACKET_SIZE, > @@ -1177,7 +1177,7 @@ static int j1939_sk_send_loop(struct j1939_priv *pr= iv, struct sock *sk, >=20 > todo_size -=3D segment_size; > session->total_queued_size +=3D segment_size; > - } > + } while (todo_size); >=20 > switch (ret) { > case 0: /* OK */ > diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c > index 319f47df3330..99832e60c08d 100644 > --- a/net/can/j1939/transport.c > +++ b/net/can/j1939/transport.c > @@ -382,8 +382,9 @@ sk_buff *j1939_session_skb_get_by_offset(struct j1939= _session *session, > skb_queue_walk(&session->skb_queue, do_skb) { > do_skcb =3D j1939_skb_to_cb(do_skb); >=20 > - if (offset_start >=3D do_skcb->offset && > - offset_start < (do_skcb->offset + do_skb->len)) { > + if ((offset_start >=3D do_skcb->offset && > + offset_start < (do_skcb->offset + do_skb->len)) || > + (offset_start =3D=3D 0 && do_skcb->offset =3D=3D 0 && do_skb->len =3D= =3D 0)) { > skb =3D do_skb; > } > } > -- > 2.43.0 >=20 >=20 >=20 --=20 Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung N=C3=BCrnberg | Phone: +49-5121-206917-129 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | --vxpme32c2iydzg67 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEUEC6huC2BN0pvD5fKDiiPnotvG8FAmd9MJ4ACgkQKDiiPnot vG/l6AgAhak9L/3s2F2He8AP9r2x4LJNpKRcQ+492x2vyKtSofznR4tZBg02eYXN dhvfdY6yv8jnbCc7/bpI4vgxyvGvIDTJok5V/boQ4/ubK0bNvFRgtMwXTvGSKBcW 0C9TddSCyPUg3+iYjagbZ++qTo02iEsI3BChYYonif1967953df/vmV8cKudOnLn PO+No+i2yfDagu1BOzO0Isg9+dWXC9IneOx9wwjF1fjdivLqcjXrAM6EkCQTGpTT 5YiJoJNYiP100cHF9rmC2kpdakxJl/yeHPlRfo0jnEZdrhWuhidLQoYfdoZ3oEeI WADmhhGiHjeXtzRqJ8nqVLfNSP+Yug== =TuID -----END PGP SIGNATURE----- --vxpme32c2iydzg67--