Messages in this thread Patch in this message | | | Date | Thu, 01 Oct 2009 16:31:34 -0700 | From | Greg KH <> | Subject | [patch 18/30] net ax25: Fix signed comparison in the sockopt handler |
| |
2.6.30-stable review patch. If anyone has any objections, please let us know.
------------------ From: Arjan van de Ven <arjan@linux.intel.com>
fixed upstream in commit b7058842c940ad2c08dd829b21e5c92ebe3b8758 in a different way
The ax25 code tried to use
if (optlen < sizeof(int)) return -EINVAL;
as a security check against optlen being negative (or zero) in the set socket option.
Unfortunately, "sizeof(int)" is an unsigned property, with the result that the whole comparison is done in unsigned, letting negative values slip through.
This patch changes this to
if (optlen < (int)sizeof(int)) return -EINVAL;
so that the comparison is done as signed, and negative values get properly caught.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Cc: David S. Miller <davem@davemloft.net> Cc: Ingo Molnar <mingo@elte.hu> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- net/ax25/af_ax25.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -539,7 +539,7 @@ static int ax25_setsockopt(struct socket if (level != SOL_AX25) return -ENOPROTOOPT; - if (optlen < sizeof(int)) + if (optlen < (int)sizeof(int)) return -EINVAL; if (get_user(opt, (int __user *)optval))
| |