Skip to contentSkip to conversation

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

PATCH Applied [email protected] 2 participants 2 messages Jan 9, 2009 – Jan 10, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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

From: Julia Lawall <[email protected]>

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>

---

 net/bridge/netfilter/ebtables.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/bridge/netfilter/ebtables.c renamed from net/bridge/netfilter/ebtables.c~net-bridge-netfilter-move-a-dereference-below-a-null-test +2 -1
diff -puN net/bridge/netfilter/ebtables.c~net-bridge-netfilter-move-a-dereference-below-a-null-test net/bridge/netfilter/ebtables.c
@@ -85,12 +85,13 @@ static inline int ebt_do_match (struct e
 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++;

_