From: <gregkh@linuxfoundation.org>
To: gregkh@linuxfoundation.org,lukas.magel@posteo.net,maxime.jayat@mobile-devices.fr,menschel.p@posteo.de,michal.sojka@cvut.cz,mkl@pengutronix.de,patches@lists.linux.dev,sashal@kernel.org,socketcan@hartkopp.net
Cc: <stable-commits@vger.kernel.org>
Subject: Patch "can: isotp: change error format from decimal to symbolic error names" has been added to the 5.10-stable tree
Date: Mon, 06 Nov 2023 12:23:20 +0100 [thread overview]
Message-ID: <2023110619-handiwork-untainted-98de@gregkh> (raw)
In-Reply-To: <20231031092918.2668-2-socketcan@hartkopp.net>
This is a note to let you know that I've just added the patch titled
can: isotp: change error format from decimal to symbolic error names
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
can-isotp-change-error-format-from-decimal-to-symbolic-error-names.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
From stable-owner@vger.kernel.org Tue Oct 31 10:30:30 2023
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Tue, 31 Oct 2023 10:29:09 +0100
Subject: can: isotp: change error format from decimal to symbolic error names
To: gregkh@linuxfoundation.org, stable@vger.kernel.org, sashal@kernel.org
Cc: linux-can@vger.kernel.org, lukas.magel@posteo.net, patches@lists.linux.dev, maxime.jayat@mobile-devices.fr, mkl@pengutronix.de, michal.sojka@cvut.cz, Patrick Menschel <menschel.p@posteo.de>, Oliver Hartkopp <socketcan@hartkopp.net>
Message-ID: <20231031092918.2668-2-socketcan@hartkopp.net>
From: Patrick Menschel <menschel.p@posteo.de>
commit 46d8657a6b284e32b6b3bf1a6c93ee507fdd3cdb upstream
This patch changes the format string for errors from decimal %d to
symbolic error names %pe to achieve more comprehensive log messages.
Link: https://lore.kernel.org/r/20210427052150.2308-2-menschel.p@posteo.de
Signed-off-by: Patrick Menschel <menschel.p@posteo.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/can/isotp.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/net/can/isotp.c
+++ b/net/can/isotp.c
@@ -228,8 +228,8 @@ static int isotp_send_fc(struct sock *sk
can_send_ret = can_send(nskb, 1);
if (can_send_ret)
- pr_notice_once("can-isotp: %s: can_send_ret %d\n",
- __func__, can_send_ret);
+ pr_notice_once("can-isotp: %s: can_send_ret %pe\n",
+ __func__, ERR_PTR(can_send_ret));
dev_put(dev);
@@ -814,8 +814,8 @@ isotp_tx_burst:
can_send_ret = can_send(skb, 1);
if (can_send_ret)
- pr_notice_once("can-isotp: %s: can_send_ret %d\n",
- __func__, can_send_ret);
+ pr_notice_once("can-isotp: %s: can_send_ret %pe\n",
+ __func__, ERR_PTR(can_send_ret));
if (so->tx.idx >= so->tx.len) {
/* we are done */
@@ -976,8 +976,8 @@ static int isotp_sendmsg(struct socket *
err = can_send(skb, 1);
dev_put(dev);
if (err) {
- pr_notice_once("can-isotp: %s: can_send_ret %d\n",
- __func__, err);
+ pr_notice_once("can-isotp: %s: can_send_ret %pe\n",
+ __func__, ERR_PTR(err));
/* no transmission -> no timeout monitoring */
if (hrtimer_sec)
Patches currently in stable-queue which might be from stable-owner@vger.kernel.org are
queue-5.10/ext4-avoid-overlapping-preallocations-due-to-overflow.patch
queue-5.10/can-isotp-isotp_bind-do-not-validate-unused-address-information.patch
queue-5.10/can-isotp-set-max-pdu-size-to-64-kbyte.patch
queue-5.10/can-isotp-isotp_bind-return-einval-on-incorrect-can-id-formatting.patch
queue-5.10/ext4-fix-bug-in-ext4_mb_new_inode_pa-due-to-overflow.patch
queue-5.10/can-isotp-add-symbolic-error-message-to-isotp_module_init.patch
queue-5.10/rpmsg-fix-calling-device_lock-on-non-initialized-device.patch
queue-5.10/can-isotp-change-error-format-from-decimal-to-symbolic-error-names.patch
queue-5.10/can-isotp-isotp_sendmsg-fix-tx-state-detection-and-wait-behavior.patch
queue-5.10/rpmsg-constify-local-variable-in-field-store-macro.patch
queue-5.10/can-isotp-add-error-message-if-txqueuelen-is-too-small.patch
queue-5.10/rpmsg-glink-release-driver_override.patch
queue-5.10/driver-platform-add-helper-for-safer-setting-of-driver_override.patch
queue-5.10/can-isotp-check-can-address-family-in-isotp_bind.patch
queue-5.10/rpmsg-fix-kfree-of-static-memory-on-setting-driver_override.patch
queue-5.10/can-isotp-add-local-echo-tx-processing-and-tx-without-fc.patch
queue-5.10/can-isotp-handle-wait_event_interruptible-return-values.patch
queue-5.10/rpmsg-fix-possible-refcount-leak-in-rpmsg_register_device_override.patch
queue-5.10/ext4-add-two-helper-functions-extent_logical_end-and-pa_logical_end.patch
next prev parent reply other threads:[~2023-11-06 11:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-31 9:29 [PATCH stable 5.10 00/10] can: isotp: upgrade to latest 6.1 LTS code base Oliver Hartkopp
2023-10-31 9:29 ` [PATCH stable 5.10 01/10] can: isotp: change error format from decimal to symbolic error names Oliver Hartkopp
2023-11-06 11:23 ` gregkh [this message]
2023-10-31 9:29 ` [PATCH stable 5.10 02/10] can: isotp: add symbolic error message to isotp_module_init() Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: add symbolic error message to isotp_module_init()" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 03/10] can: isotp: Add error message if txqueuelen is too small Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: Add error message if txqueuelen is too small" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 04/10] can: isotp: set max PDU size to 64 kByte Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: set max PDU size to 64 kByte" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 05/10] can: isotp: isotp_bind(): return -EINVAL on incorrect CAN ID formatting Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: isotp_bind(): return -EINVAL on incorrect CAN ID formatting" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 06/10] can: isotp: check CAN address family in isotp_bind() Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: check CAN address family in isotp_bind()" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 07/10] can: isotp: handle wait_event_interruptible() return values Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: handle wait_event_interruptible() return values" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 08/10] can: isotp: add local echo tx processing and tx without FC Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: add local echo tx processing and tx without FC" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 09/10] can: isotp: isotp_bind(): do not validate unused address information Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: isotp_bind(): do not validate unused address information" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 10/10] can: isotp: isotp_sendmsg(): fix TX state detection and wait behavior Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: isotp_sendmsg(): fix TX state detection and wait behavior" has been added to the 5.10-stable tree gregkh
2023-11-06 11:23 ` [PATCH stable 5.10 00/10] can: isotp: upgrade to latest 6.1 LTS code base Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2023110619-handiwork-untainted-98de@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=lukas.magel@posteo.net \
--cc=maxime.jayat@mobile-devices.fr \
--cc=menschel.p@posteo.de \
--cc=michal.sojka@cvut.cz \
--cc=mkl@pengutronix.de \
--cc=patches@lists.linux.dev \
--cc=sashal@kernel.org \
--cc=socketcan@hartkopp.net \
--cc=stable-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox