]> git.baikalelectronics.ru Git - kernel.git/commit
switchdev: SWITCHDEV_OBJ_PORT_{VLAN, MDB}(): Sanitize
authorPetr Machata <petrm@mellanox.com>
Thu, 22 Nov 2018 23:28:07 +0000 (23:28 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 24 Nov 2018 02:02:23 +0000 (18:02 -0800)
commit7cbc0d0542579a75d8cd775b5c4b769763f25393
tree903a86beef9400399b38992e84e56f6587a0f1b4
parentd1c9f242424af561ee872eff9eae5bf31ee37e23
switchdev: SWITCHDEV_OBJ_PORT_{VLAN, MDB}(): Sanitize

The two macros SWITCHDEV_OBJ_PORT_VLAN() and SWITCHDEV_OBJ_PORT_MDB()
expand to a container_of() call, yielding an appropriate container of
their sole argument. However, due to a name collision, the first
argument, i.e. the contained object pointer, is not the only one to get
expanded. The third argument, which is a structure member name, and
should be kept literal, gets expanded as well. The only safe way to use
these two macros is therefore to name the local variable passed to them
"obj".

To fix this, rename the sole argument of the two macros from
"obj" (which collides with the member name) to "OBJ". Additionally,
instead of passing "OBJ" to container_of() verbatim, parenthesize it, so
that a comma in the passed-in expression doesn't pollute the
container_of() invocation.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/switchdev.h