[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4744029.MmARg0u2A0@vostro.rjw.lan>
Date: Tue, 04 Nov 2014 01:43:24 +0100
From: "Rafael J. Wysocki" <rjw@...ysocki.net>
To: Grant Likely <grant.likely@...aro.org>
Cc: devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
Mika Westerberg <mika.westerberg@...ux.intel.com>,
Rob Herring <robh+dt@...nel.org>,
Arnd Bergmann <arnd@...db.de>,
Darren Hart <darren.hart@...el.com>, stable@...r.kernel.org
Subject: Re: [PATCH] of: Fix overflow bug in string property parsing functions
On Monday, November 03, 2014 11:38:24 PM Grant Likely wrote:
[cut]
> diff --git a/include/linux/of.h b/include/linux/of.h
> index 6545e7aec7bb..3b3c6e849ae8 100644
> --- a/include/linux/of.h
> +++ b/include/linux/of.h
> @@ -267,14 +267,12 @@ extern int of_property_read_u64(const struct device_node *np,
> extern int of_property_read_string(struct device_node *np,
> const char *propname,
> const char **out_string);
> -extern int of_property_read_string_index(struct device_node *np,
> - const char *propname,
> - int index, const char **output);
> extern int of_property_match_string(struct device_node *np,
> const char *propname,
> const char *string);
> -extern int of_property_count_strings(struct device_node *np,
> - const char *propname);
> +extern int of_property_read_string_helper(struct device_node *np,
> + const char *propname,
> + const char **out_strs, size_t sz, int index);
> extern int of_device_is_compatible(const struct device_node *device,
> const char *);
> extern int of_device_is_available(const struct device_node *device);
> @@ -486,15 +484,9 @@ static inline int of_property_read_string(struct device_node *np,
> return -ENOSYS;
> }
>
> -static inline int of_property_read_string_index(struct device_node *np,
> - const char *propname, int index,
> - const char **out_string)
> -{
> - return -ENOSYS;
> -}
> -
> -static inline int of_property_count_strings(struct device_node *np,
> - const char *propname)
> +static inline int of_property_read_string_helper(struct device_node *np,
> + const char *propname,
> + char **out_strs, size_t sz, int index)
const char **out_strs, size_t sz, int index)
> {
> return -ENOSYS;
> }
Other than that, looks good to me.
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists