2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Samuel Ortiz <[email protected]> commit efc463eb508798da4243625b08c7396462cabf9f upstream. Reported-by: Ilja Van Sprundel <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- net/irda/parameters.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: linux/net/irda/parameters.c =================================================================== --- linux.orig/net/irda/parameters.c +++ linux/net/irda/parameters.c @@ -298,6 +298,8 @@ static int irda_extract_string(void *sel p.pi = pi; /* In case handler needs to know */ p.pl = buf[1]; /* Extract length of value */ + if (p.pl > 32) + p.pl = 32; IRDA_DEBUG(2, "%s(), pi=%#x, pl=%d\n", __func__, p.pi, p.pl); @@ -318,7 +320,7 @@ static int irda_extract_string(void *sel (__u8) str[0], (__u8) str[1]); /* Null terminate string */ - str[p.pl+1] = '\0'; + str[p.pl] = '\0'; p.pv.c = str; /* Handler will need to take a copy */ _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
