dri-devel Archive mirror
 help / color / mirror / Atom feed
From: Jim Cromie <jim.cromie@gmail.com>
To: jbaron@akamai.com, gregkh@linuxfoundation.org,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	amd-gfx@lists.freedesktop.org,
	intel-gvt-dev@lists.freedesktop.org,
	intel-gfx@lists.freedesktop.org
Cc: ukaszb@chromium.org, linux-doc@vger.kernel.org,
	daniel.vetter@ffwll.ch, tvrtko.ursulin@linux.intel.com,
	jani.nikula@intel.com, ville.syrjala@linux.intel.com,
	seanpaul@chromium.org, robdclark@gmail.com, groeck@google.com,
	yanivt@google.com, bleung@google.com,
	Jim Cromie <jim.cromie@gmail.com>,
	stable@vger.kernel.org
Subject: [PATCH v8 01/35] dyndbg: fix old BUG_ON in >control parser
Date: Mon, 29 Apr 2024 13:31:11 -0600	[thread overview]
Message-ID: <20240429193145.66543-2-jim.cromie@gmail.com> (raw)
In-Reply-To: <20240429193145.66543-1-jim.cromie@gmail.com>

Fix a BUG_ON from 2009.  Even if it looks "unreachable" (I didn't
really look), lets make sure by removing it, doing pr_err and return
-EINVAL instead.

cc: stable@vger.kernel.org
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
 lib/dynamic_debug.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index c78f335fa981..f2c5e7910bb1 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -302,7 +302,11 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
 		} else {
 			for (end = buf; *end && !isspace(*end); end++)
 				;
-			BUG_ON(end == buf);
+			if (end == buf) {
+				pr_err("parse err after word:%d=%s\n", nwords,
+				       nwords ? words[nwords - 1] : "<none>");
+				return -EINVAL;
+			}
 		}
 
 		/* `buf' is start of word, `end' is one past its end */
-- 
2.44.0


  reply	other threads:[~2024-04-29 19:32 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-29 19:31 [PATCH v8 00/35] fix CONFIG_DRM_USE_DYNAMIC_DEBUG=y regression Jim Cromie
2024-04-29 19:31 ` Jim Cromie [this message]
2024-04-29 19:31 ` [PATCH v8 02/35] docs/dyndbg: update examples \012 to \n Jim Cromie
2024-04-29 19:31 ` [PATCH v8 03/35] test-dyndbg: fixup CLASSMAP usage error Jim Cromie
2024-04-29 19:31 ` [PATCH v8 04/35] dyndbg: reword "class unknown, " to "class:_UNKNOWN_" Jim Cromie
2024-04-29 19:31 ` [PATCH v8 05/35] dyndbg: make ddebug_class_param union members same size Jim Cromie
2024-04-29 19:31 ` [PATCH v8 06/35] dyndbg: replace classmap list with a vector Jim Cromie
2024-04-29 19:31 ` [PATCH v8 07/35] dyndbg: ddebug_apply_class_bitmap - add module arg, select on it Jim Cromie
2024-04-29 19:31 ` [PATCH v8 08/35] dyndbg: split param_set_dyndbg_classes to _module & wrapper fns Jim Cromie
2024-04-29 19:31 ` [PATCH v8 09/35] dyndbg: drop NUM_TYPE_ARRAY Jim Cromie
2024-04-29 19:31 ` [PATCH v8 10/35] dyndbg: reduce verbose/debug clutter Jim Cromie
2024-04-29 19:31 ` [PATCH v8 11/35] dyndbg: silence debugs with no-change updates Jim Cromie
2024-04-29 19:31 ` [PATCH v8 12/35] dyndbg: tighten ddebug_class_name() 1st arg type Jim Cromie
2024-04-29 19:31 ` [PATCH v8 13/35] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Jim Cromie
2024-04-29 19:31 ` [PATCH v8 14/35] dyndbg: reduce verbose=3 messages in ddebug_add_module Jim Cromie
2024-04-29 19:31 ` [PATCH v8 15/35] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Jim Cromie
2024-04-29 19:31 ` [PATCH v8 16/35] dyndbg-API: fix DECLARE_DYNDBG_CLASSMAP Jim Cromie
2024-04-29 19:31 ` [PATCH v8 17/35] selftests-dyndbg: add tools/testing/selftests/dynamic_debug/* Jim Cromie
2024-04-29 19:31 ` [PATCH v8 18/35] selftests-dyndbg: exit 127 if no facility Jim Cromie
2024-04-29 19:31 ` [PATCH v8 19/35] dyndbg-API: promote DYNDBG_CLASSMAP_PARAM to API Jim Cromie
2024-04-29 19:31 ` [PATCH v8 20/35] dyndbg-doc: add classmap info to howto Jim Cromie
2024-04-29 19:31 ` [PATCH v8 21/35] dyndbg: treat comma as a token separator Jim Cromie
2024-04-29 19:31 ` [PATCH v8 22/35] selftests-dyndbg: add comma_terminator_tests Jim Cromie
2024-05-08 19:32 ` [PATCH v8 00/35] fix CONFIG_DRM_USE_DYNAMIC_DEBUG=y regression jim.cromie

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=20240429193145.66543-2-jim.cromie@gmail.com \
    --to=jim.cromie@gmail.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=bleung@google.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=groeck@google.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-gvt-dev@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=jbaron@akamai.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robdclark@gmail.com \
    --cc=seanpaul@chromium.org \
    --cc=stable@vger.kernel.org \
    --cc=tvrtko.ursulin@linux.intel.com \
    --cc=ukaszb@chromium.org \
    --cc=ville.syrjala@linux.intel.com \
    --cc=yanivt@google.com \
    /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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).