]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
[S390] cmm: fix crash on case conversion
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 25 Oct 2010 14:10:21 +0000 (16:10 +0200)
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>
Mon, 25 Oct 2010 14:10:17 +0000 (16:10 +0200)
When the cmm module is compiled into the kernel it will crash when
writing to the R/O data section.
Reason is the lower to upper case conversion of the "sender" module
parameter which ignored the fact that the pointer is preinitialized.

Introduced with 41b42876 "cmm, smsgiucv_app: convert sender to
uppercase"

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/mm/cmm.c

index a9550dca3e4b2fed74fc7472dbfd3da95d4526fc..c66ffd8dbbb732416ad3d803d00ec02da6125555 100644 (file)
 #include <asm/pgalloc.h>
 #include <asm/diag.h>
 
-static char *sender = "VMRMSVM";
+#ifdef CONFIG_CMM_IUCV
+static char *cmm_default_sender = "VMRMSVM";
+#endif
+static char *sender;
 module_param(sender, charp, 0400);
 MODULE_PARM_DESC(sender,
                 "Guest name that may send SMSG messages (default VMRMSVM)");
@@ -440,6 +443,8 @@ static int __init cmm_init(void)
                int len = strlen(sender);
                while (len--)
                        sender[len] = toupper(sender[len]);
+       } else {
+               sender = cmm_default_sender;
        }
 
        rc = smsg_register_callback(SMSG_PREFIX, cmm_smsg_target);