s390/pai: fix attr_event_free upper limit for pai device drivers

[ Upstream commit 225d09d6e5f3870560665a1829d2db79330b4c58 ]

When the device drivers are initialized, a sysfs directory
is created. This contains many attributes which are allocated with
kzalloc(). Should it fail, the memory for the attributes already
created is freed in attr_event_free(). Its second parameter is number
of attribute elements to delete. This parameter is off by one.
When i. e. the 10th attribute fails to get created, attributes
numbered 0 to 9 should be deleted. Currently only attributes
numbered 0 to 8 are deleted.

Fixes: 39d62336f5c1 ("s390/pai: add support for cryptography counters")
Reported-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/s390/kernel/perf_pai_crypto.c b/arch/s390/kernel/perf_pai_crypto.c
index fe7d1774ded18439270efeb3eecd200cbcc8893c..4a4e914c283c804a6524614a7d874b6e953991aa 100644 (file)
--- a/arch/s390/kernel/perf_pai_crypto.c
+++ b/arch/s390/kernel/perf_pai_crypto.c
@@ -646,7 +646,7 @@ static int __init attr_event_init(void)
        for (i = 0; i < ARRAY_SIZE(paicrypt_ctrnames); i++) {
                ret = attr_event_init_one(attrs, i);
                if (ret) {
-                       attr_event_free(attrs, i - 1);
+                       attr_event_free(attrs, i);
                        return ret;
                }
        }

diff --git a/arch/s390/kernel/perf_pai_ext.c b/arch/s390/kernel/perf_pai_ext.c
index c57c1a203256fba029be8e0a17344cbce5cc0957..b5febe22d0546409df63b92c170b0f5aebad67a3 100644 (file)
--- a/arch/s390/kernel/perf_pai_ext.c
+++ b/arch/s390/kernel/perf_pai_ext.c
@@ -607,7 +607,7 @@ static int __init attr_event_init(void)
        for (i = 0; i < ARRAY_SIZE(paiext_ctrnames); i++) {
                ret = attr_event_init_one(attrs, i);
                if (ret) {
-                       attr_event_free(attrs, i - 1);
+                       attr_event_free(attrs, i);
                        return ret;
                }
        }