From: Kent Gibson <warthog618@gmail.com>
To: linux-gpio@vger.kernel.org, bgolaszewski@baylibre.com
Cc: Kent Gibson <warthog618@gmail.com>, Pedro Botella <pbotella@gmail.com>
Subject: [lingpiod][PATCH] bindings: python: fix uninitialized default_vals being passed to gpiod_LineBulk_request()
Date: Mon, 15 Feb 2021 20:48:31 +0800 [thread overview]
Message-ID: <20210215124831.60707-1-warthog618@gmail.com> (raw)
If "default_vals" is not provided in the kwds then default_vals are
passed uninitialized to gpiod_line_request_bulk(), so rename the
existing default_vals to vals and introduce a new default_vals that
points to vals, or NULL if no defaults have been passed.
Fixes: 96c524c4951c (bindings: implement python bindings)
Reported-by: Pedro Botella <pbotella@gmail.com>
Signed-off-by: Kent Gibson <warthog618@gmail.com>
---
bindings/python/gpiodmodule.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/bindings/python/gpiodmodule.c b/bindings/python/gpiodmodule.c
index fee4c32..832787d 100644
--- a/bindings/python/gpiodmodule.c
+++ b/bindings/python/gpiodmodule.c
@@ -1327,12 +1327,13 @@ static PyObject *gpiod_LineBulk_request(gpiod_LineBulkObject *self,
NULL };
int rv, type = gpiod_LINE_REQ_DIR_AS_IS, flags = 0,
- default_vals[GPIOD_LINE_BULK_MAX_LINES], val;
+ vals[GPIOD_LINE_BULK_MAX_LINES], val;
PyObject *def_vals_obj = NULL, *iter, *next;
struct gpiod_line_request_config conf;
struct gpiod_line_bulk bulk;
Py_ssize_t num_def_vals;
char *consumer = NULL;
+ const int *default_vals = NULL;
Py_ssize_t i;
if (gpiod_LineBulkOwnerIsClosed(self))
@@ -1348,7 +1349,7 @@ static PyObject *gpiod_LineBulk_request(gpiod_LineBulkObject *self,
gpiod_MakeRequestConfig(&conf, consumer, type, flags);
if (def_vals_obj) {
- memset(default_vals, 0, sizeof(default_vals));
+ memset(vals, 0, sizeof(vals));
num_def_vals = PyObject_Size(def_vals_obj);
if (num_def_vals != self->num_lines) {
@@ -1375,8 +1376,9 @@ static PyObject *gpiod_LineBulk_request(gpiod_LineBulkObject *self,
return NULL;
}
- default_vals[i] = !!val;
+ vals[i] = !!val;
}
+ default_vals = vals;
}
Py_BEGIN_ALLOW_THREADS;
--
2.30.0
next reply other threads:[~2021-02-15 12:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-15 12:48 Kent Gibson [this message]
2021-02-15 15:48 ` [lingpiod][PATCH] bindings: python: fix uninitialized default_vals being passed to gpiod_LineBulk_request() Bartosz Golaszewski
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=20210215124831.60707-1-warthog618@gmail.com \
--to=warthog618@gmail.com \
--cc=bgolaszewski@baylibre.com \
--cc=linux-gpio@vger.kernel.org \
--cc=pbotella@gmail.com \
/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