summaryrefslogtreecommitdiff
path: root/accel-pppd/ppp/ppp_ccp.c
diff options
context:
space:
mode:
authorKozlov Dmitry <xeb@mail.ru>2011-10-10 10:12:38 +0400
committerKozlov Dmitry <xeb@mail.ru>2011-10-10 10:12:38 +0400
commit676a6f6eccf98df6ccd3feb31ddd4313a8659811 (patch)
tree20e4cd46dbdac99c871fe56f35340b7d3c9b15d7 /accel-pppd/ppp/ppp_ccp.c
parent2405fd6ba52618f07c0fa11d85c0f039653678bc (diff)
downloadaccel-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_ccp.c')
-rw-r--r--accel-pppd/ppp/ppp_ccp.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/accel-pppd/ppp/ppp_ccp.c b/accel-pppd/ppp/ppp_ccp.c
index 6b97215..88adc30 100644
--- a/accel-pppd/ppp/ppp_ccp.c
+++ b/accel-pppd/ppp/ppp_ccp.c
@@ -387,12 +387,14 @@ static int ccp_recv_conf_req(struct ppp_ccp_t *ccp, uint8_t *data, int size)
while (size > 0) {
hdr = (struct ccp_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 = CCP_OPT_NONE;
list_add_tail(&ropt->entry, &ccp->ropt_list);
@@ -481,9 +483,6 @@ static int ccp_recv_conf_rej(struct ppp_ccp_t *ccp, uint8_t *data, int size)
while (size > 0) {
hdr = (struct ccp_opt_hdr_t *)data;
- if (!hdr->len || hdr->len > size)
- break;
-
list_for_each_entry(lopt, &ccp->options, entry) {
if (lopt->id == hdr->id) {
if (!lopt->h->recv_conf_rej)
@@ -522,9 +521,6 @@ static int ccp_recv_conf_nak(struct ppp_ccp_t *ccp, uint8_t *data, int size)
while (size > 0) {
hdr = (struct ccp_opt_hdr_t *)data;
- if (!hdr->len || hdr->len > size)
- break;
-
list_for_each_entry(lopt, &ccp->options, entry) {
if (lopt->id == hdr->id) {
if (conf_ppp_verbose) {
@@ -565,9 +561,6 @@ static int ccp_recv_conf_ack(struct ppp_ccp_t *ccp, uint8_t *data, int size)
while (size > 0) {
hdr = (struct ccp_opt_hdr_t *)data;
- if (!hdr->len || hdr->len > size)
- break;
-
list_for_each_entry(lopt, &ccp->options, entry) {
if (lopt->id == hdr->id) {
if (conf_ppp_verbose) {