diff options
author | Petr Štetiar <ynezz@true.cz> | 2019-12-28 21:00:39 +0300 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2019-12-28 23:17:46 +0300 |
commit | cd75136b1342e1e9dabf921be13240c6653640ed (patch) | |
tree | da548e77a0846762c7f323cbaea439cfb7201f00 /blobmsg.c | |
parent | eb7eb6393d47a918c420f5b287946dbd6c0d5f57 (diff) |
blobmsg: fix wrong payload len passed from blobmsg_check_array
Fix incorrect use of blob_raw_len() on passed blobmsg to
blobmsg_check_array_len() introduced in commit b0e21553ae8c ("blobmsg:
add _len variants for all attribute checking methods") by using correct
blobmsg_len().
This wrong (higher) length was then for example causing issues in
procd's instance_config_parse_command() where blobmsg_check_attr_list()
was failing sanity checking of service command, thus resulting in the
startup failures of some services like collectd, nlbwmon and samba4.
Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-December/020840.html
Fixes: b0e21553ae8c ("blobmsg: add _len variants for all attribute checking methods")
Reported-by: Hannu Nyman <hannu.nyman@welho.com>
Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'blobmsg.c')
-rw-r--r-- | blobmsg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -95,7 +95,7 @@ bool blobmsg_check_attr_len(const struct blob_attr *attr, bool name, size_t len) int blobmsg_check_array(const struct blob_attr *attr, int type) { - return blobmsg_check_array_len(attr, type, blob_raw_len(attr)); + return blobmsg_check_array_len(attr, type, blobmsg_len(attr)); } int blobmsg_check_array_len(const struct blob_attr *attr, int type, size_t len) |