diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-05-19 04:36:36 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-20 16:38:14 -0400 |
| commit | 25dff94ff9df40d4d663bb6ea3193a7758cc50e5 (patch) | |
| tree | 2371e9c1dea647c690a2b01255d462656a8393ce | |
| parent | 057cf65e4f715f62acccbd9125cf63eddfe69d30 (diff) | |
isdn/kcapi: fix a small underflow
In get_capi_ctr_by_nr() and get_capi_appl_by_nr() the parameter comes
from skb->data. The current code can underflow to one space before the
start of the array.
The sanity check isn't needed in __get_capi_appl_by_nr() but I changed
it to match the others.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/isdn/capi/kcapi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index 9b1b274c7d25..c123709acf82 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c | |||
| @@ -93,7 +93,7 @@ capi_ctr_put(struct capi_ctr *ctr) | |||
| 93 | 93 | ||
| 94 | static inline struct capi_ctr *get_capi_ctr_by_nr(u16 contr) | 94 | static inline struct capi_ctr *get_capi_ctr_by_nr(u16 contr) |
| 95 | { | 95 | { |
| 96 | if (contr - 1 >= CAPI_MAXCONTR) | 96 | if (contr < 1 || contr - 1 >= CAPI_MAXCONTR) |
| 97 | return NULL; | 97 | return NULL; |
| 98 | 98 | ||
| 99 | return capi_controller[contr - 1]; | 99 | return capi_controller[contr - 1]; |
| @@ -103,7 +103,7 @@ static inline struct capi20_appl *__get_capi_appl_by_nr(u16 applid) | |||
| 103 | { | 103 | { |
| 104 | lockdep_assert_held(&capi_controller_lock); | 104 | lockdep_assert_held(&capi_controller_lock); |
| 105 | 105 | ||
| 106 | if (applid - 1 >= CAPI_MAXAPPL) | 106 | if (applid < 1 || applid - 1 >= CAPI_MAXAPPL) |
| 107 | return NULL; | 107 | return NULL; |
| 108 | 108 | ||
| 109 | return capi_applications[applid - 1]; | 109 | return capi_applications[applid - 1]; |
| @@ -111,7 +111,7 @@ static inline struct capi20_appl *__get_capi_appl_by_nr(u16 applid) | |||
| 111 | 111 | ||
| 112 | static inline struct capi20_appl *get_capi_appl_by_nr(u16 applid) | 112 | static inline struct capi20_appl *get_capi_appl_by_nr(u16 applid) |
| 113 | { | 113 | { |
| 114 | if (applid - 1 >= CAPI_MAXAPPL) | 114 | if (applid < 1 || applid - 1 >= CAPI_MAXAPPL) |
| 115 | return NULL; | 115 | return NULL; |
| 116 | 116 | ||
| 117 | return rcu_dereference(capi_applications[applid - 1]); | 117 | return rcu_dereference(capi_applications[applid - 1]); |
