l2tp: Allow duplicate session creation with UDP
authorRidge Kennedy <ridge.kennedy@alliedtelesis.co.nz>
Mon, 3 Feb 2020 23:24:00 +0000 (12:24 +1300)
committerSasha Levin <sashal@kernel.org>
Tue, 30 Jun 2020 19:38:37 +0000 (15:38 -0400)
commitcb6f92ed839f2efbff7a6369a42f0d3b7a9f8268
tree0332f13ac47cc0176245a8488a2df0cd3d3a8afc
parentec0bdc2824e7358988dec46dedf01a851832ebcc
l2tp: Allow duplicate session creation with UDP

commit 0d0d9a388a858e271bb70e71e99e7fe2a6fd6f64 upstream.

In the past it was possible to create multiple L2TPv3 sessions with the
same session id as long as the sessions belonged to different tunnels.
The resulting sessions had issues when used with IP encapsulated tunnels,
but worked fine with UDP encapsulated ones. Some applications began to
rely on this behaviour to avoid having to negotiate unique session ids.

Some time ago a change was made to require session ids to be unique across
all tunnels, breaking the applications making use of this "feature".

This change relaxes the duplicate session id check to allow duplicates
if both of the colliding sessions belong to UDP encapsulated tunnels.

Fixes: dbdbc73b4478 ("l2tp: fix duplicate session creation")
Signed-off-by: Ridge Kennedy <ridge.kennedy@alliedtelesis.co.nz>
Acked-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/l2tp/l2tp_core.c