summaryrefslogtreecommitdiff
path: root/accel-pppd/ppp/ppp_lcp.c
diff options
context:
space:
mode:
Diffstat (limited to 'accel-pppd/ppp/ppp_lcp.c')
-rw-r--r--accel-pppd/ppp/ppp_lcp.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c
index fa23436..955b859 100644
--- a/accel-pppd/ppp/ppp_lcp.c
+++ b/accel-pppd/ppp/ppp_lcp.c
@@ -368,14 +368,12 @@ static int lcp_recv_conf_req(struct ppp_lcp_t *lcp, uint8_t *data, int size)
while (size > 0) {
hdr = (struct lcp_opt_hdr_t *)data;
+ if (!hdr->len || hdr->len > size)
+ break;
+
ropt = _malloc(sizeof(*ropt));
memset(ropt, 0, sizeof(*ropt));
- if (hdr->len > size)
- ropt->len = size;
- else
- ropt->len = hdr->len;
-
ropt->hdr = hdr;
ropt->state = LCP_OPT_NONE;
list_add_tail(&ropt->entry, &lcp->ropt_list);
@@ -461,6 +459,9 @@ static int lcp_recv_conf_rej(struct ppp_lcp_t *lcp, uint8_t *data, int size)
while (size > 0) {
hdr = (struct lcp_opt_hdr_t *)data;
+ if (!hdr->len || hdr->len > size)
+ break;
+
list_for_each_entry(lopt, &lcp->options, entry) {
if (lopt->id == hdr->id) {
if (conf_ppp_verbose) {
@@ -503,6 +504,9 @@ static int lcp_recv_conf_nak(struct ppp_lcp_t *lcp, uint8_t *data, int size)
while (size > 0) {
hdr = (struct lcp_opt_hdr_t *)data;
+ if (!hdr->len || hdr->len > size)
+ break;
+
list_for_each_entry(lopt,&lcp->options,entry) {
if (lopt->id == hdr->id) {
if (conf_ppp_verbose) {
@@ -543,6 +547,9 @@ static int lcp_recv_conf_ack(struct ppp_lcp_t *lcp, uint8_t *data, int size)
while (size > 0) {
hdr = (struct lcp_opt_hdr_t *)data;
+ if (!hdr->len || hdr->len > size)
+ break;
+
list_for_each_entry(lopt, &lcp->options, entry) {
if (lopt->id == hdr->id) {
if (conf_ppp_verbose) {