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

Commit fcfd6dfa authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by David S. Miller
Browse files

ipv4: mark expected switch fall-throughs 



In preparation to enabling -Wimplicit-fallthrough, mark switch cases
where we are expecting to fall through.

Notice that in some cases I placed the "fall through" comment
on its own line, which is what GCC is expecting to find.

Addresses-Coverity-ID: 115108
Signed-off-by: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86e58cce

net/ipv4/af_inet.c

+2 −1
Original line number Diff line number Diff line
@@ -827,6 +827,7 @@ int inet_shutdown(struct socket *sock, int how) 
		err = -ENOTCONN;

		/* Hack to wake up other listeners, who can poll for

		   POLLHUP, even on eg. unconnected UDP sockets -- RR */

		/* fall through */

	default:

		sk->sk_shutdown |= how;

		if (sk->sk_prot->shutdown)
@@ -840,7 +841,7 @@ int inet_shutdown(struct socket *sock, int how) 
	case TCP_LISTEN:

		if (!(how & RCV_SHUTDOWN))

			break;

		/* Fall through */

		/* fall through */

	case TCP_SYN_SENT:

		err = sk->sk_prot->disconnect(sk, O_NONBLOCK);

		sock->state = err ? SS_DISCONNECTING : SS_UNCONNECTED;

net/ipv4/arp.c

+1 −0
Original line number Diff line number Diff line
@@ -1180,6 +1180,7 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg) 
	case SIOCSARP:

		if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

			return -EPERM;

		/* fall through */

	case SIOCGARP:

		err = copy_from_user(&r, arg, sizeof(struct arpreq));

		if (err)

net/ipv4/devinet.c

+1 −0
Original line number Diff line number Diff line
@@ -1522,6 +1522,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, 
		if (inetdev_valid_mtu(dev->mtu))

			break;

		/* disable IP when MTU is not enough */

		/* fall through */

	case NETDEV_UNREGISTER:

		inetdev_destroy(in_dev);

		break;

net/ipv4/ipmr.c

+1 −0
Original line number Diff line number Diff line
@@ -1528,6 +1528,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, 
	case MRT_ADD_MFC:

	case MRT_DEL_MFC:

		parent = -1;

		/* fall through */

	case MRT_ADD_MFC_PROXY:

	case MRT_DEL_MFC_PROXY:

		if (optlen != sizeof(mfc)) {

net/ipv4/netfilter/nf_nat_l3proto_ipv4.c

+2 −1
Original line number Diff line number Diff line
@@ -276,7 +276,8 @@ nf_nat_ipv4_fn(void *priv, struct sk_buff *skb, 
			else

				return NF_ACCEPT;

		}

		/* Fall thru... (Only ICMPs can be IP_CT_IS_REPLY) */

		/* Only ICMPs can be IP_CT_IS_REPLY: */

		/* fall through */

	case IP_CT_NEW:

		/* Seen it before?  This can happen for loopback, retrans,

		 * or local packets.