leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NET]: Do not memcmp() over pad bytes of struct flowi.

Browse Source 
They are not necessarily initialized to zero by the compiler,
for example when using run-time initializers of automatic
on-stack variables.

Noticed by Eric Dumazet and Patrick McHardy.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2006-10-12 00:49:15 -07:00
parent 42b6785eeb
commit 8238b218ec
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/decnet/dn_route.c
View File

@ -267,9 +267,14 @@ static void dn_dst_link_failure(struct sk_buff *skb)
static inline int compare_keys(struct flowi *fl1, struct flowi *fl2) static inline int compare_keys(struct flowi *fl1, struct flowi *fl2)
{ {
return memcmp(&fl1->nl_u.dn_u, &fl2->nl_u.dn_u, sizeof(fl1->nl_u.dn_u)) == 0 && return ((fl1->nl_u.dn_u.daddr ^ fl2->nl_u.dn_u.daddr) |
fl1->oif == fl2->oif && (fl1->nl_u.dn_u.saddr ^ fl2->nl_u.dn_u.saddr) |
fl1->iif == fl2->iif; #ifdef CONFIG_IP_ROUTE_FWMARK
(fl1->nl_u.dn_u.fwmark ^ fl2->nl_u.dn_u.fwmark) |
#endif
(fl1->nl_u.dn_u.scope ^ fl2->nl_u.dn_u.scope) |
(fl1->oif ^ fl2->oif) |
(fl1->iif ^ fl2->iif)) == 0;
} }
static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route **rp) static int dn_insert_route(struct dn_route *rt, unsigned hash, struct dn_route **rp)

12
net/ipv4/route.c
View File

@ -566,9 +566,15 @@ static inline u32 rt_score(struct rtable *rt)
static inline int compare_keys(struct flowi *fl1, struct flowi *fl2) static inline int compare_keys(struct flowi *fl1, struct flowi *fl2)
{ {
return memcmp(&fl1->nl_u.ip4_u, &fl2->nl_u.ip4_u, sizeof(fl1->nl_u.ip4_u)) == 0 && return ((fl1->nl_u.ip4_u.daddr ^ fl2->nl_u.ip4_u.daddr) |
fl1->oif == fl2->oif && (fl1->nl_u.ip4_u.saddr ^ fl2->nl_u.ip4_u.saddr) |
fl1->iif == fl2->iif; #ifdef CONFIG_IP_ROUTE_FWMARK
(fl1->nl_u.ip4_u.fwmark ^ fl2->nl_u.ip4_u.fwmark) |
#endif
(*(u16 *)&fl1->nl_u.ip4_u.tos ^
*(u16 *)&fl2->nl_u.ip4_u.tos) |
(fl1->oif ^ fl2->oif) |
(fl1->iif ^ fl2->iif)) == 0;
} }
#ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED