[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <16005876.GSA3ToWriD@sifl>
Date: Tue, 17 Jul 2012 17:24:50 -0400
From: Paul Moore <pmoore@...hat.com>
To: netdev@...r.kernel.org
Subject: Re: [PATCH] cipso: don't follow a NULL pointer when setsockopt() is called
On Tuesday, July 17, 2012 05:07:47 PM Paul Moore wrote:
> As reported by Alan Cox, and verified by Lin Ming, when a user
> attempts to add a CIPSO option to a socket using the CIPSO_V4_TAG_LOCAL
> tag the kernel dies a terrible death when it attempts to follow a NULL
> pointer (the skb argument to cipso_v4_validate() is NULL when called via
> the setsockopt() syscall).
>
> This patch fixes this by first checking to ensure that the skb is
> non-NULL before using it to find the incoming network interface. In
> the unlikely case where the skb is NULL and the user attempts to add
> a CIPSO option with the _TAG_LOCAL tag we return an error as this is
> not something we want to allow.
...
> CC: Lin Ming <mlin@...pku.edu.cn>
> Reported-by: Alan Cox <alan@...rguk.ukuu.org.uk>
> Signed-off-by: Paul Moore <pmoore@...hat.com>
Argh, I just realized I forgot to CC the stable folks.
David, if you don't queue this up for them, let me know and I'll resend it to
stable once it hits Linus' tree.
> ---
> net/ipv4/cipso_ipv4.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
> index c48adc5..667c1d4 100644
> --- a/net/ipv4/cipso_ipv4.c
> +++ b/net/ipv4/cipso_ipv4.c
> @@ -1725,8 +1725,10 @@ int cipso_v4_validate(const struct sk_buff *skb,
> unsigned char **option) case CIPSO_V4_TAG_LOCAL:
> /* This is a non-standard tag that we only allow for
> * local connections, so if the incoming interface is
> - * not the loopback device drop the packet. */
> - if (!(skb->dev->flags & IFF_LOOPBACK)) {
> + * not the loopback device drop the packet. Further,
> + * there is no legitimate reason for setting this from
> + * userspace so reject it if skb is NULL. */
> + if (skb == NULL || !(skb->dev->flags & IFF_LOOPBACK)) {
> err_offset = opt_iter;
> goto validate_return_locked;
> }
--
paul moore
security and virtualization @ redhat
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists