ppp: clarify parsing of user supplied data in ppp_set_compress()
authorGuillaume Nault <g.nault@alphalink.fr>
Tue, 23 Feb 2016 12:59:43 +0000 (13:59 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 25 Feb 2016 04:52:51 +0000 (23:52 -0500)
commit555d5b70f1597906dc2e31085f5e70b49d03a536
tree6167393b53a3cece4957cca9e0167af387c573c5
parent4fee7dab07bb2c7dfc3369e0f0e28e3fd4fc00c4
ppp: clarify parsing of user supplied data in ppp_set_compress()

* Split big conditional statement.
  * Check (data.length <= CCP_MAX_OPTION_LENGTH) only once.
  * Don't read ccp_option[1] if not initialised.

Reading uninitialised ccp_option[1] was harmless, because this could
only happen when data.length was 0 or 1. So even then, we couldn't pass
the (ccp_option[1] < 2 || ccp_option[1] > data.length) test anyway.

Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ppp/ppp_generic.c