Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b06c38 authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

[IPVS]: Make sure ip_vs_ftp ports are valid: module_param_array approach 



I'm not entirely sure what happens in the case of a valid port,
at best it'll be silently ignored. This patch ensures that
the port values are unsigned short values, and thus always valid.

This is a second take at fixing this problem, it is simpler
and arguably more correct than the previous approach
that was committed as 3f5af5b3.
Prior to this patch a patch that reverses
3f5af5b3 was sent.

Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e44fd82c

net/ipv4/ipvs/ip_vs_ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ 
 * List of ports (up to IP_VS_APP_MAX_PORTS) to be handled by helper

 * First port is set to the default port.

 */

static int ports[IP_VS_APP_MAX_PORTS] = {21, 0};

module_param_array(ports, int, NULL, 0);

static unsigned short ports[IP_VS_APP_MAX_PORTS] = {21, 0};

module_param_array(ports, ushort, NULL, 0);

MODULE_PARM_DESC(ports, "Ports to monitor for FTP control commands");