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

Commit f3d8b2e4 authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

net/bridge/netfilter: move a dereference below a NULL test 

In each case, if the NULL test is necessary, then the dereference should be
moved below the NULL test.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/

)

// <smpl>
@@
type T;
expression E;
identifier i,fld;
statement S;
@@

- T i = E->fld;
+ T i;
  ... when != E
      when != i
  if (E == NULL) S
+ i = E->fld;
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c614a50

net/bridge/netfilter/ebtables.c

+2 −1
Original line number Diff line number Diff line
@@ -85,12 +85,13 @@ static inline int ebt_do_match (struct ebt_entry_match *m, 
static inline int ebt_dev_check(char *entry, const struct net_device *device)

{

	int i = 0;

	const char *devname = device->name;

	const char *devname;



	if (*entry == '\0')

		return 0;

	if (!device)

		return 1;

	devname = device->name;

	/* 1 is the wildcard token */

	while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i])

		i++;