Commit cfe355c5 authored by Hangbin Liu's avatar Hangbin Liu Committed by Jakub Kicinski
Browse files

Bonding: return HWTSTAMP_FLAG_BONDED_PHC_INDEX to notify user space 



If the userspace program is distributed in binary form (distro package),
there is no way to know on which kernel versions it will run.

Let's only check if the flag was set when do SIOCSHWTSTAMP. And return
hwtstamp_config with flag HWTSTAMP_FLAG_BONDED_PHC_INDEX to notify
userspace whether the new feature is supported or not.

Suggested-by: default avatarJakub Kicinski <kuba@kernel.org>
Fixes: 085d6100 ("Bonding: force user to add HWTSTAMP_FLAG_BONDED_PHC_INDEX when get/set HWTSTAMP")
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1bb412d4

drivers/net/bonding/bond_main.c

+26 −16
Original line number Diff line number Diff line
@@ -4124,28 +4124,38 @@ static int bond_eth_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cm 


		break;

	case SIOCSHWTSTAMP:

	case SIOCGHWTSTAMP:

		if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))

			return -EFAULT;



		if (cfg.flags & HWTSTAMP_FLAG_BONDED_PHC_INDEX) {

		if (!(cfg.flags & HWTSTAMP_FLAG_BONDED_PHC_INDEX))

			return -EOPNOTSUPP;



		fallthrough;

	case SIOCGHWTSTAMP:

		rcu_read_lock();

		real_dev = bond_option_active_slave_get_rcu(bond);

		rcu_read_unlock();

			if (real_dev) {

		if (!real_dev)

			return -EOPNOTSUPP;



		strscpy_pad(ifrr.ifr_name, real_dev->name, IFNAMSIZ);

		ifrr.ifr_ifru = ifr->ifr_ifru;



		ops = real_dev->netdev_ops;

		if (netif_device_present(real_dev) && ops->ndo_eth_ioctl) {

			res = ops->ndo_eth_ioctl(real_dev, &ifrr, cmd);

			if (res)

				return res;



					if (!res)

			ifr->ifr_ifru = ifrr.ifr_ifru;

			if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))

				return -EFAULT;



					return res;

				}

			}

			/* Set the BOND_PHC_INDEX flag to notify user space */

			cfg.flags |= HWTSTAMP_FLAG_BONDED_PHC_INDEX;



			return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ?

				-EFAULT : 0;

		}

		fallthrough;

	default: