UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/sdvo: Reduce the size of the on stack buffers 

The strings we want to print to the on stack buffers should
be no more than
8 * 3 + strlen("(GET_SCALED_HDTV_RESOLUTION_SUPPORT)") + 1 = 61
bytes. So let's shrink the buffers down to 64 bytes.

Also switch the BUG_ON()s to WARN_ON()s if I made a mistake in
my arithmentic.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200108181242.13650-1-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Ville Syrjälä 2020-01-08 20:12:34 +02:00
parent 691313ea62
commit cb70b713a8
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/i915/display/intel_sdvo.c
View File

@ -414,12 +414,10 @@ static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,
{ {
const char *cmd_name; const char *cmd_name;
int i, pos = 0; int i, pos = 0;
#define BUF_LEN 256 char buffer[64];
char buffer[BUF_LEN];
#define BUF_PRINT(args...) \ #define BUF_PRINT(args...) \
pos += snprintf(buffer + pos, max_t(int, BUF_LEN - pos, 0), args) pos += snprintf(buffer + pos, max_t(int, sizeof(buffer) - pos, 0), args)
for (i = 0; i < args_len; i++) { for (i = 0; i < args_len; i++) {
BUF_PRINT("%02X ", ((u8 *)args)[i]); BUF_PRINT("%02X ", ((u8 *)args)[i]);
@ -433,9 +431,9 @@ static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,
BUF_PRINT("(%s)", cmd_name); BUF_PRINT("(%s)", cmd_name);
else else
BUF_PRINT("(%02X)", cmd); BUF_PRINT("(%02X)", cmd);
BUG_ON(pos >= BUF_LEN - 1);
WARN_ON(pos >= sizeof(buffer) - 1);
#undef BUF_PRINT #undef BUF_PRINT
#undef BUF_LEN
DRM_DEBUG_KMS("%s: W: %02X %s\n", SDVO_NAME(intel_sdvo), cmd, buffer); DRM_DEBUG_KMS("%s: W: %02X %s\n", SDVO_NAME(intel_sdvo), cmd, buffer);
} }
@ -540,8 +538,7 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
u8 retry = 15; /* 5 quick checks, followed by 10 long checks */ u8 retry = 15; /* 5 quick checks, followed by 10 long checks */
u8 status; u8 status;
int i, pos = 0; int i, pos = 0;
#define BUF_LEN 256 char buffer[64];
char buffer[BUF_LEN];
buffer[0] = '\0'; buffer[0] = '\0';
@ -581,7 +578,7 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
} }
#define BUF_PRINT(args...) \ #define BUF_PRINT(args...) \
pos += snprintf(buffer + pos, max_t(int, BUF_LEN - pos, 0), args) pos += snprintf(buffer + pos, max_t(int, sizeof(buffer) - pos, 0), args)
cmd_status = sdvo_cmd_status(status); cmd_status = sdvo_cmd_status(status);
if (cmd_status) if (cmd_status)
@ -600,9 +597,9 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
goto log_fail; goto log_fail;
BUF_PRINT(" %02X", ((u8 *)response)[i]); BUF_PRINT(" %02X", ((u8 *)response)[i]);
} }
BUG_ON(pos >= BUF_LEN - 1);
WARN_ON(pos >= sizeof(buffer) - 1);
#undef BUF_PRINT #undef BUF_PRINT
#undef BUF_LEN
DRM_DEBUG_KMS("%s: R: %s\n", SDVO_NAME(intel_sdvo), buffer); DRM_DEBUG_KMS("%s: R: %s\n", SDVO_NAME(intel_sdvo), buffer);
return true; return true;