summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kernel/sclp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/s390/kernel/sclp.c b/arch/s390/kernel/sclp.c
index 7453243..53e391f 100644
--- a/arch/s390/kernel/sclp.c
+++ b/arch/s390/kernel/sclp.c
@@ -132,16 +132,21 @@ static void _sclp_print_lm(const char *str)
0x10, 0x00, /* 4 */
0x00, 0x00, 0x00, 0x00 /* 6 */
};
- unsigned char *ptr, ch;
+ unsigned char *ptr, *end_ptr, ch;
unsigned int count;
memcpy(_sclp_work_area, write_head, sizeof(write_head));
ptr = _sclp_work_area + sizeof(write_head);
+ end_ptr = _sclp_work_area + sizeof(_sclp_work_area) - 1;
do {
+ if (ptr + sizeof(write_mto) > end_ptr)
+ break;
memcpy(ptr, write_mto, sizeof(write_mto));
for (count = sizeof(write_mto); (ch = *str++) != 0; count++) {
if (ch == 0x0a)
break;
+ if (ptr > end_ptr)
+ break;
ptr[count] = _ascebc[ch];
}
/* Update length fields in mto, mdb, evbuf and sccb */
OpenPOWER on IntegriCloud