LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

[GIT PULL 2/2] ipvs: ip_vs_sh: ip_vs_sh_get_port: check skb_header_point

To: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Subject: [GIT PULL 2/2] ipvs: ip_vs_sh: ip_vs_sh_get_port: check skb_header_pointer for NULL
Cc: lvs-devel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, netfilter-devel@xxxxxxxxxxxxxxx, Wensong Zhang <wensong@xxxxxxxxxxxx>, Julian Anastasov <ja@xxxxxx>, Daniel Borkmann <dborkman@xxxxxxxxxx>, Simon Horman <horms@xxxxxxxxxxxx>
From: Simon Horman <horms@xxxxxxxxxxxx>
Date: Wed, 7 Aug 2013 17:40:29 +0900
From: Daniel Borkmann <dborkman@xxxxxxxxxx>

skb_header_pointer could return NULL, so check for it as we do it
everywhere else in ipvs code. This fixes a coverity warning.

Signed-off-by: Daniel Borkmann <dborkman@xxxxxxxxxx>
Acked-by: Julian Anastasov <ja@xxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
---
 net/netfilter/ipvs/ip_vs_sh.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index f16c027..3588fae 100644
--- a/net/netfilter/ipvs/ip_vs_sh.c
+++ b/net/netfilter/ipvs/ip_vs_sh.c
@@ -269,14 +269,20 @@ ip_vs_sh_get_port(const struct sk_buff *skb, struct 
ip_vs_iphdr *iph)
        switch (iph->protocol) {
        case IPPROTO_TCP:
                th = skb_header_pointer(skb, iph->len, sizeof(_tcph), &_tcph);
+               if (unlikely(th == NULL))
+                       return 0;
                port = th->source;
                break;
        case IPPROTO_UDP:
                uh = skb_header_pointer(skb, iph->len, sizeof(_udph), &_udph);
+               if (unlikely(uh == NULL))
+                       return 0;
                port = uh->source;
                break;
        case IPPROTO_SCTP:
                sh = skb_header_pointer(skb, iph->len, sizeof(_sctph), &_sctph);
+               if (unlikely(sh == NULL))
+                       return 0;
                port = sh->source;
                break;
        default:
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

<Prev in Thread] Current Thread [Next in Thread>