| Message ID | 20190208044652.32166-1-natechancellor@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] ethtool: Remove unnecessary null check in ethtool_rx_flow_rule_create | expand |
On Thu, Feb 07, 2019 at 09:46:53PM -0700, Nathan Chancellor wrote: > net/core/ethtool.c:3023:19: warning: address of array > 'ext_m_spec->h_dest' will always evaluate to 'true' > [-Wpointer-bool-conversion] > if (ext_m_spec->h_dest) { > ~~ ~~~~~~~~~~~~^~~~~~ > > h_dest is an array, it can't be null so remove this check. > > Fixes: eca4205f9ec3 ("ethtool: add ethtool_rx_flow_spec to flow_rule structure translator") > Link: https://github.com/ClangBuiltLinux/linux/issues/353 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> Thanks!
From: Nathan Chancellor <natechancellor@gmail.com> Date: Thu, 7 Feb 2019 21:46:53 -0700 > net/core/ethtool.c:3023:19: warning: address of array > 'ext_m_spec->h_dest' will always evaluate to 'true' > [-Wpointer-bool-conversion] > if (ext_m_spec->h_dest) { > ~~ ~~~~~~~~~~~~^~~~~~ > > h_dest is an array, it can't be null so remove this check. > > Fixes: eca4205f9ec3 ("ethtool: add ethtool_rx_flow_spec to flow_rule structure translator") > Link: https://github.com/ClangBuiltLinux/linux/issues/353 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Applied.
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 0fbf39239b29..d2c47cdf25da 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -3020,17 +3020,15 @@ ethtool_rx_flow_rule_create(const struct ethtool_rx_flow_spec_input *input) const struct ethtool_flow_ext *ext_h_spec = &fs->h_ext; const struct ethtool_flow_ext *ext_m_spec = &fs->m_ext; - if (ext_m_spec->h_dest) { - memcpy(match->key.eth_addrs.dst, ext_h_spec->h_dest, - ETH_ALEN); - memcpy(match->mask.eth_addrs.dst, ext_m_spec->h_dest, - ETH_ALEN); - - match->dissector.used_keys |= - BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS); - match->dissector.offset[FLOW_DISSECTOR_KEY_ETH_ADDRS] = - offsetof(struct ethtool_rx_flow_key, eth_addrs); - } + memcpy(match->key.eth_addrs.dst, ext_h_spec->h_dest, + ETH_ALEN); + memcpy(match->mask.eth_addrs.dst, ext_m_spec->h_dest, + ETH_ALEN); + + match->dissector.used_keys |= + BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS); + match->dissector.offset[FLOW_DISSECTOR_KEY_ETH_ADDRS] = + offsetof(struct ethtool_rx_flow_key, eth_addrs); } act = &flow->rule->action.entries[0];
net/core/ethtool.c:3023:19: warning: address of array 'ext_m_spec->h_dest' will always evaluate to 'true' [-Wpointer-bool-conversion] if (ext_m_spec->h_dest) { ~~ ~~~~~~~~~~~~^~~~~~ h_dest is an array, it can't be null so remove this check. Fixes: eca4205f9ec3 ("ethtool: add ethtool_rx_flow_spec to flow_rule structure translator") Link: https://github.com/ClangBuiltLinux/linux/issues/353 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- net/core/ethtool.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)