Merge branch 'l2tp-set-l2specific_len-based-on-l2specific_type'

Browse source

Lorenzo Bianconi says:

====================
l2tp: set l2specific_len based on l2specific_type

Do not rely on l2specific_len value provided by userspace but set sublayer
length according to l2specific_type.
Mark L2TP_ATTR_L2SPEC_LEN attribute as not used

Changes since v2:
- drop the patch related to a fix in the switch default case in
  l2tp_nl_cmd_session_create()
- use L2SPECTYPE_NONE as default case in l2tp_get_l2specific_len()

Changes since v1:
- remove l2specific_len parameter
- add sanity check on l2specific_type provided by userspace
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2018-01-19 15:00:49 -05:00

parent e0e8a14971 4db5a802e5

commit bfd072df10

5 changed files with 38 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/uapi/linux/l2tp.h

View file

35

net/l2tp/l2tp_core.c

View file

13

net/l2tp/l2tp_core.h

View file

2

net/l2tp/l2tp_debugfs.c

View file

15

net/l2tp/l2tp_netlink.c

View file