diff options
| author | Wilson Kok <[email protected]> | 2015-05-25 13:39:31 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-05-26 00:29:54 +0000 |
| commit | eb8d7baae21584a7b27e79c2deca3eee72376ff0 (patch) | |
| tree | d8bbfc35fd7d7021a31fa0cc941bbaec8ef74ab8 | |
| parent | pktgen: remove one sparse error (diff) | |
| download | kernel-eb8d7baae21584a7b27e79c2deca3eee72376ff0.tar.gz kernel-eb8d7baae21584a7b27e79c2deca3eee72376ff0.zip | |
bridge: skip fdb add if the port shouldn't learn
Check in fdb_add_entry() if the source port should learn, similar
check is used in br_fdb_update.
Note that new fdb entries which are added manually or
as local ones are still permitted.
This patch has been tested by running traffic via a bridge port and
switching the port's state, also by manually adding/removing entries
from the bridge's fdb.
Signed-off-by: Wilson Kok <[email protected]>
Signed-off-by: Nikolay Aleksandrov <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | net/bridge/br_fdb.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index e0670d7054f9..7896cf143045 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -736,6 +736,12 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr, struct net_bridge_fdb_entry *fdb; bool modified = false; + /* If the port cannot learn allow only local and static entries */ + if (!(state & NUD_PERMANENT) && !(state & NUD_NOARP) && + !(source->state == BR_STATE_LEARNING || + source->state == BR_STATE_FORWARDING)) + return -EPERM; + fdb = fdb_find(head, addr, vid); if (fdb == NULL) { if (!(flags & NLM_F_CREATE)) |