x25: add a sanity check parsing X.25 facilities
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 3 Sep 2013 09:03:40 +0000 (12:03 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Sep 2013 04:27:27 +0000 (00:27 -0400)
This was found with a manual audit and I don't have a reproducer.  We
limit ->calling_len and ->called_len when we get them from
copy_from_user() in x25_ioctl() so when they come from skb->data then
we should cap them there as well.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/x25/x25_facilities.c

index 66c638730c7a862af95f3d83897505ce33518bd0..b8253250d723314da1fd7b544289d49b38078c24 100644 (file)
@@ -156,6 +156,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,
                        case X25_FAC_CALLING_AE:
                                if (p[1] > X25_MAX_DTE_FACIL_LEN || p[1] <= 1)
                                        return -1;
+                               if (p[2] > X25_MAX_AE_LEN)
+                                       return -1;
                                dte_facs->calling_len = p[2];
                                memcpy(dte_facs->calling_ae, &p[3], p[1] - 1);
                                *vc_fac_mask |= X25_MASK_CALLING_AE;
@@ -163,6 +165,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,
                        case X25_FAC_CALLED_AE:
                                if (p[1] > X25_MAX_DTE_FACIL_LEN || p[1] <= 1)
                                        return -1;
+                               if (p[2] > X25_MAX_AE_LEN)
+                                       return -1;
                                dte_facs->called_len = p[2];
                                memcpy(dte_facs->called_ae, &p[3], p[1] - 1);
                                *vc_fac_mask |= X25_MASK_CALLED_AE;