Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit d92c7f8aabae913de16eb855b19cd2002c341896

Authored by Jesper Juhl
Committed by David S. Miller
1 parent 6c71bec66a
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

caif: Do not dereference NULL in chnl_recv_cb() 

In net/caif/chnl_net.c::chnl_recv_cb() we call skb_header_pointer()
which may return NULL, but we do not check for a NULL pointer before
dereferencing it.
This patch adds such a NULL check and properly free's allocated memory
and return an error (-EINVAL) on failure - much better than crashing..

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

... ... @@ -94,6 +94,10 @@
94 94  
95 95 /* check the version of IP */
96 96 ip_version = skb_header_pointer(skb, 0, 1, &buf);
  97 + if (!ip_version) {
  98 + kfree_skb(skb);
  99 + return -EINVAL;
  100 + }
97 101  
98 102 switch (*ip_version >> 4) {
99 103 case 4: