From: Lino Sanfilippo <LinoSanfilippo@gmx.de>
To: jic23@kernel.org
Cc: knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
Lino Sanfilippo <LinoSanfilippo@gmx.de>
Subject: [PATCH] iio:core: In map_array_register() cleanup in case of error
Date: Sun, 11 Oct 2020 14:41:20 +0200 [thread overview]
Message-ID: <1602420080-15905-1-git-send-email-LinoSanfilippo@gmx.de> (raw)
In function map_array_register() properly rewind in case of error.
Furthermore save an extra label by using a break instead of goto to leave
the concerning loop.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
---
drivers/iio/inkern.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index 5a8351c..0735cc4 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -28,6 +28,7 @@ int iio_map_array_register(struct iio_dev *indio_dev, struct iio_map *maps)
{
int i = 0, ret = 0;
struct iio_map_internal *mapi;
+ struct list_head *pos, *tmp;
if (maps == NULL)
return 0;
@@ -37,14 +38,22 @@ int iio_map_array_register(struct iio_dev *indio_dev, struct iio_map *maps)
mapi = kzalloc(sizeof(*mapi), GFP_KERNEL);
if (mapi == NULL) {
ret = -ENOMEM;
- goto error_ret;
+ break;
}
mapi->map = &maps[i];
mapi->indio_dev = indio_dev;
list_add_tail(&mapi->l, &iio_map_list);
i++;
}
-error_ret:
+
+ if (ret) { /* undo */
+ while (i--) {
+ mapi = list_last_entry(&iio_map_list,
+ struct iio_map_internal, l);
+ list_del(&mapi->l);
+ kfree(mapi);
+ }
+ }
mutex_unlock(&iio_map_list_lock);
return ret;
--
2.7.4
next reply other threads:[~2020-10-11 12:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-11 12:41 Lino Sanfilippo [this message]
2020-10-11 15:07 ` [PATCH] iio:core: In map_array_register() cleanup in case of error Jonathan Cameron
2020-10-11 18:05 ` Lino Sanfilippo
2020-10-11 18:22 ` [PATCH v2] " Lino Sanfilippo
2020-10-16 15:09 ` Andy Shevchenko
2020-10-18 1:11 ` Lino Sanfilippo
2020-10-18 1:11 ` [PATCH 1/2] iio:core: Introduce unlocked version of iio_map_array_unregister() Lino Sanfilippo
2020-10-18 18:21 ` Andy Shevchenko
2020-10-18 1:11 ` [PATCH 2/2] iio:core: In iio_map_array_register() cleanup in case of error Lino Sanfilippo
2020-10-18 9:56 ` [PATCH v2] iio:core: In map_array_register() " Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1602420080-15905-1-git-send-email-LinoSanfilippo@gmx.de \
--to=linosanfilippo@gmx.de \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).