aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/chp.h
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2016-01-25 10:30:27 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-01-26 12:47:23 +0100
commit0d9bfe9123cfde59bf5c2e375b59d2a7d5061c4c (patch)
treedabfd7b8bd41bfd5b75fd332aafb03122fa0df78 /drivers/s390/cio/chp.h
parents390/zcrypt: Fix cryptographic device id in kernel messages (diff)
downloadlinux-dev-0d9bfe9123cfde59bf5c2e375b59d2a7d5061c4c.tar.xz
linux-dev-0d9bfe9123cfde59bf5c2e375b59d2a7d5061c4c.zip
s390/cio: fix measurement characteristics memleak
Measurement characteristics are allocated during channel path registration but not freed during deregistration. Fix this by embedding these characteristics inside struct channel_path. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/chp.h')
-rw-r--r--drivers/s390/cio/chp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/chp.h b/drivers/s390/cio/chp.h
index 4efd5b867cc3..af0232290dc4 100644
--- a/drivers/s390/cio/chp.h
+++ b/drivers/s390/cio/chp.h
@@ -48,7 +48,7 @@ struct channel_path {
/* Channel-measurement related stuff: */
int cmg;
int shared;
- void *cmg_chars;
+ struct cmg_chars cmg_chars;
};
/* Return channel_path struct for given chpid. */