diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2011-10-10 10:12:38 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2011-10-10 10:12:38 +0400 |
| commit | 676a6f6eccf98df6ccd3feb31ddd4313a8659811 (patch) | |
| tree | 20e4cd46dbdac99c871fe56f35340b7d3c9b15d7 /accel-pppd/ppp/ppp_lcp.c | |
| parent | 2405fd6ba52618f07c0fa11d85c0f039653678bc (diff) | |
| download | accel-ppp-xebd-676a6f6eccf98df6ccd3feb31ddd4313a8659811.tar.gz accel-ppp-xebd-676a6f6eccf98df6ccd3feb31ddd4313a8659811.zip | |
Revert "ppp: options header sanity check"
This reverts commit 2405fd6ba52618f07c0fa11d85c0f039653678bc.
Diffstat (limited to 'accel-pppd/ppp/ppp_lcp.c')
| -rw-r--r-- | accel-pppd/ppp/ppp_lcp.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c index 955b859..fa23436 100644 --- a/accel-pppd/ppp/ppp_lcp.c +++ b/accel-pppd/ppp/ppp_lcp.c @@ -368,12 +368,14 @@ 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); @@ -459,9 +461,6 @@ 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) { @@ -504,9 +503,6 @@ 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) { @@ -547,9 +543,6 @@ 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) { |