| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20260120161852.639238-3-skorodumov.dmitry@huawei.com>
Date: Tue, 20 Jan 2026 19:18:35 +0300
From: Dmitry Skorodumov <dskr99@...il.com>
To: netdev@...r.kernel.org,
Jakub Kicinski <kuba@...nel.org>,
Dmitry Skorodumov <skorodumov.dmitry@...wei.com>,
Xiao Liang <shaw.leon@...il.com>,
Kuniyuki Iwashima <kuniyu@...gle.com>,
Stanislav Fomichev <sdf@...ichev.me>,
linux-kernel@...r.kernel.org
Cc: Andrew Lunn <andrew+netdev@...n.ch>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Paolo Abeni <pabeni@...hat.com>
Subject: [PATCH net 2/3] ipvlan: Common code from v6/v4 validator_event
Extract commond code for ipvlan_addr4_validator_event()/
ipvlan_addr6_validator_event() to own function.
Get rid of separate functions for xxx_validator_event()
and check whether we are called for ipv4 or ipv6 by
looking at "notifier_block *nblock" argument
Signed-off-by: Dmitry Skorodumov <skorodumov.dmitry@...wei.com>
---
drivers/net/ipvlan/ipvlan_main.c | 108 +++++++++++++++----------------
1 file changed, 54 insertions(+), 54 deletions(-)
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index cf8c1ea78f4b..dda891911ea4 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -878,6 +878,33 @@ static bool ipvlan_is_valid_dev(const struct net_device *dev)
return true;
}
+static int ipvlan_addr_validator_event(struct net_device *dev,
+ unsigned long event,
+ struct netlink_ext_ack *extack,
+ const void *iaddr,
+ bool is_v6)
+{
+ struct ipvl_dev *ipvlan = netdev_priv(dev);
+ int ret = NOTIFY_OK;
+
+ if (!ipvlan_is_valid_dev(dev))
+ return NOTIFY_DONE;
+
+ switch (event) {
+ case NETDEV_UP:
+ spin_lock_bh(&ipvlan->port->addrs_lock);
+ if (ipvlan_addr_busy(ipvlan->port, iaddr, is_v6)) {
+ NL_SET_ERR_MSG(extack,
+ "Address already assigned to an ipvlan device");
+ ret = notifier_from_errno(-EADDRINUSE);
+ }
+ spin_unlock_bh(&ipvlan->port->addrs_lock);
+ break;
+ }
+
+ return ret;
+}
+
#if IS_ENABLED(CONFIG_IPV6)
static int ipvlan_add_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr)
{
@@ -922,32 +949,6 @@ static int ipvlan_addr6_event(struct notifier_block *unused,
return NOTIFY_OK;
}
-
-static int ipvlan_addr6_validator_event(struct notifier_block *unused,
- unsigned long event, void *ptr)
-{
- struct in6_validator_info *i6vi = (struct in6_validator_info *)ptr;
- struct net_device *dev = (struct net_device *)i6vi->i6vi_dev->dev;
- struct ipvl_dev *ipvlan = netdev_priv(dev);
- int ret = NOTIFY_OK;
-
- if (!ipvlan_is_valid_dev(dev))
- return NOTIFY_DONE;
-
- switch (event) {
- case NETDEV_UP:
- spin_lock_bh(&ipvlan->port->addrs_lock);
- if (ipvlan_addr_busy(ipvlan->port, &i6vi->i6vi_addr, true)) {
- NL_SET_ERR_MSG(i6vi->extack,
- "Address already assigned to an ipvlan device");
- ret = notifier_from_errno(-EADDRINUSE);
- }
- spin_unlock_bh(&ipvlan->port->addrs_lock);
- break;
- }
-
- return ret;
-}
#endif
static int ipvlan_add_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr)
@@ -997,38 +998,15 @@ static int ipvlan_addr4_event(struct notifier_block *unused,
return NOTIFY_OK;
}
-static int ipvlan_addr4_validator_event(struct notifier_block *unused,
- unsigned long event, void *ptr)
-{
- struct in_validator_info *ivi = (struct in_validator_info *)ptr;
- struct net_device *dev = (struct net_device *)ivi->ivi_dev->dev;
- struct ipvl_dev *ipvlan = netdev_priv(dev);
- int ret = NOTIFY_OK;
-
- if (!ipvlan_is_valid_dev(dev))
- return NOTIFY_DONE;
-
- switch (event) {
- case NETDEV_UP:
- spin_lock_bh(&ipvlan->port->addrs_lock);
- if (ipvlan_addr_busy(ipvlan->port, &ivi->ivi_addr, false)) {
- NL_SET_ERR_MSG(ivi->extack,
- "Address already assigned to an ipvlan device");
- ret = notifier_from_errno(-EADDRINUSE);
- }
- spin_unlock_bh(&ipvlan->port->addrs_lock);
- break;
- }
-
- return ret;
-}
+static int ipvlan_addr_validator_event_cb(struct notifier_block *nblock,
+ unsigned long event, void *ptr);
static struct notifier_block ipvlan_addr4_notifier_block __read_mostly = {
.notifier_call = ipvlan_addr4_event,
};
static struct notifier_block ipvlan_addr4_vtor_notifier_block __read_mostly = {
- .notifier_call = ipvlan_addr4_validator_event,
+ .notifier_call = ipvlan_addr_validator_event_cb,
};
static struct notifier_block ipvlan_notifier_block __read_mostly = {
@@ -1040,10 +1018,32 @@ static struct notifier_block ipvlan_addr6_notifier_block __read_mostly = {
.notifier_call = ipvlan_addr6_event,
};
+#endif
+
static struct notifier_block ipvlan_addr6_vtor_notifier_block __read_mostly = {
- .notifier_call = ipvlan_addr6_validator_event,
+ .notifier_call = ipvlan_addr_validator_event_cb,
};
-#endif
+
+static int ipvlan_addr_validator_event_cb(struct notifier_block *nblock,
+ unsigned long event, void *ptr)
+{
+ struct in6_validator_info *i6vi;
+ struct net_device *dev;
+
+ if (nblock == &ipvlan_addr4_vtor_notifier_block) {
+ struct in_validator_info *ivi;
+
+ ivi = (struct in_validator_info *)ptr;
+ dev = ivi->ivi_dev->dev;
+ return ipvlan_addr_validator_event(dev, event, ivi->extack,
+ &ivi->ivi_addr, false);
+ }
+
+ i6vi = (struct in6_validator_info *)ptr;
+ dev = i6vi->i6vi_dev->dev;
+ return ipvlan_addr_validator_event(dev, event, i6vi->extack,
+ &i6vi->i6vi_addr, true);
+}
static int __init ipvlan_init_module(void)
{
--
2.43.0
Powered by blists - more mailing lists