Commit 1753c7c4 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Mauro Carvalho Chehab
Browse files

media: pvrusb2: use a different format for warnings 



When the pvrusb2 driver detects that there's something wrong with the
device, it prints a warning message. Right now those message are
printed in two different formats:

1. ***WARNING*** message here
2. WARNING: message here

There's an issue with the second format. Syzkaller recognizes it as a
message produced by a WARN_ON(), which is used to indicate a bug in the
kernel. However pvrusb2 prints those warnings to indicate an issue with
the device, not the bug in the kernel.

This patch changes the pvrusb2 driver to consistently use the first
warning message format. This will unblock syzkaller testing of this
driver.

Reported-by: default avatar <syzbot+af8f8d2ac0d39b0ed3a0@syzkaller.appspotmail.com>
Reported-by: default avatar <syzbot+170a86bf206dd2c6217e@syzkaller.appspotmail.com>
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent c612e54f

drivers/media/usb/pvrusb2/pvrusb2-hdw.c

+2 −2
Original line number Diff line number Diff line
@@ -1680,7 +1680,7 @@ static int pvr2_decoder_enable(struct pvr2_hdw *hdw,int enablefl) 
	}

	if (!hdw->flag_decoder_missed) {

		pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			   "WARNING: No decoder present");

			   "***WARNING*** No decoder present");

		hdw->flag_decoder_missed = !0;

		trace_stbit("flag_decoder_missed",

			    hdw->flag_decoder_missed);
@@ -2366,7 +2366,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, 
	if (hdw_desc->flag_is_experimental) {

		pvr2_trace(PVR2_TRACE_INFO, "**********");

		pvr2_trace(PVR2_TRACE_INFO,

			   "WARNING: Support for this device (%s) is experimental.",

			   "***WARNING*** Support for this device (%s) is experimental.",

							      hdw_desc->description);

		pvr2_trace(PVR2_TRACE_INFO,

			   "Important functionality might not be entirely working.");

drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c

+3 −3
Original line number Diff line number Diff line
@@ -343,11 +343,11 @@ static int i2c_hack_cx25840(struct pvr2_hdw *hdw, 


	if ((ret != 0) || (*rdata == 0x04) || (*rdata == 0x0a)) {

		pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			   "WARNING: Detected a wedged cx25840 chip; the device will not work.");

			   "***WARNING*** Detected a wedged cx25840 chip; the device will not work.");

		pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			   "WARNING: Try power cycling the pvrusb2 device.");

			   "***WARNING*** Try power cycling the pvrusb2 device.");

		pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			   "WARNING: Disabling further access to the device to prevent other foul-ups.");

			   "***WARNING*** Disabling further access to the device to prevent other foul-ups.");

		// This blocks all further communication with the part.

		hdw->i2c_func[0x44] = NULL;

		pvr2_hdw_render_useless(hdw);

drivers/media/usb/pvrusb2/pvrusb2-std.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr, 
		bcnt = pvr2_std_id_to_str(buf,sizeof(buf),fmsk);

		pvr2_trace(

			PVR2_TRACE_ERROR_LEGS,

			"WARNING: Failed to classify the following standard(s): %.*s",

			"***WARNING*** Failed to classify the following standard(s): %.*s",

			bcnt,buf);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE