[rocky8_10] History Rebuild through kernel-4.18.0-553.150.1.el8_10

Makefile.rhelver

@@ -12,7 +12,7 @@ RHEL_MINOR = 10
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 553.148.1
+RHEL_RELEASE = 553.150.1
 
 #
 # ZSTREAM

ciq/ciq_backports/kernel-4.18.0-553.150.1.el8_10/02839cc8.failed

@@ -0,0 +1,135 @@
+rtnl: move rtnl_newlink_create()
+
+jira KERNEL-1421
+cve CVE-2026-31692
+Rebuild_History Non-Buildable kernel-4.18.0-553.150.1.el8_10
+commit-author Jakub Kicinski <kuba@kernel.org>
+commit 02839cc8d72b49c1440b5019b3f40ca49c4824e5
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-4.18.0-553.150.1.el8_10/02839cc8.failed
+
+Pure code move.
+
+	Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+	Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+(cherry picked from commit 02839cc8d72b49c1440b5019b3f40ca49c4824e5)
+	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
+
+# Conflicts:
+#	net/core/rtnetlink.c
+diff --cc net/core/rtnetlink.c
+index a7b74dcf4b7a,eea5ed09e1bb..000000000000
+--- a/net/core/rtnetlink.c
++++ b/net/core/rtnetlink.c
+@@@ -3371,106 -3574,6 +3456,109 @@@ replay
+  	return rtnl_newlink_create(skb, ifm, ops, tb, data, extack);
+  }
+
+++<<<<<<< HEAD
+ +static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm,
+ +			       const struct rtnl_link_ops *ops,
+ +			       struct nlattr **tb, struct nlattr **data,
+ +			       struct netlink_ext_ack *extack)
+ +{
+ +	unsigned char name_assign_type = NET_NAME_USER;
+ +	struct net *net = sock_net(skb->sk);
+ +	struct net *dest_net, *link_net;
+ +	struct net_device *dev;
+ +	char ifname[IFNAMSIZ];
+ +	int err;
+ +
+ +	if (!ops->alloc && !ops->setup)
+ +		return -EOPNOTSUPP;
+ +
+ +	if (tb[IFLA_IFNAME]) {
+ +		nla_strscpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);
+ +	} else {
+ +		snprintf(ifname, IFNAMSIZ, "%s%%d", ops->kind);
+ +		name_assign_type = NET_NAME_ENUM;
+ +	}
+ +
+ +	dest_net = rtnl_link_get_net_capable(skb, net, tb, CAP_NET_ADMIN);
+ +	if (IS_ERR(dest_net))
+ +		return PTR_ERR(dest_net);
+ +
+ +	if (tb[IFLA_LINK_NETNSID]) {
+ +		int id = nla_get_s32(tb[IFLA_LINK_NETNSID]);
+ +
+ +		link_net = get_net_ns_by_id(dest_net, id);
+ +		if (!link_net) {
+ +			NL_SET_ERR_MSG(extack, "Unknown network namespace id");
+ +			err =  -EINVAL;
+ +			goto out;
+ +		}
+ +		err = -EPERM;
+ +		if (!netlink_ns_capable(skb, link_net->user_ns, CAP_NET_ADMIN))
+ +			goto out;
+ +	} else {
+ +		link_net = NULL;
+ +	}
+ +
+ +	dev = rtnl_create_link(link_net ? : dest_net, ifname,
+ +			       name_assign_type, ops, tb, extack);
+ +	if (IS_ERR(dev)) {
+ +		err = PTR_ERR(dev);
+ +		goto out;
+ +	}
+ +
+ +	dev->ifindex = ifm->ifi_index;
+ +
+ +	if (ops->newlink) {
+ +		err = ops->newlink(link_net ? : net, dev, tb, data, extack);
+ +		/* Drivers should call free_netdev() in ->destructor
+ +		 * and unregister it on failure after registration
+ +		 * so that device could be finally freed in rtnl_unlock.
+ +		 */
+ +		if (err < 0) {
+ +			/* If device is not registered at all, free it now */
+ +			if (dev->reg_state == NETREG_UNINITIALIZED)
+ +				free_netdev(dev);
+ +			goto out;
+ +		}
+ +	} else {
+ +		err = register_netdevice(dev);
+ +		if (err < 0) {
+ +			free_netdev(dev);
+ +			goto out;
+ +		}
+ +	}
+ +	err = rtnl_configure_link(dev, ifm);
+ +	if (err < 0)
+ +		goto out_unregister;
+ +	if (link_net) {
+ +		err = dev_change_net_namespace(dev, dest_net, ifname);
+ +		if (err < 0)
+ +			goto out_unregister;
+ +	}
+ +	if (tb[IFLA_MASTER]) {
+ +		err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER]), extack);
+ +		if (err)
+ +			goto out_unregister;
+ +	}
+ +out:
+ +	if (link_net)
+ +		put_net(link_net);
+ +	put_net(dest_net);
+ +	return err;
+ +out_unregister:
+ +	if (ops->newlink) {
+ +		LIST_HEAD(list_kill);
+ +
+ +		ops->dellink(dev, &list_kill);
+ +		unregister_netdevice_many(&list_kill);
+ +	} else {
+ +		unregister_netdevice(dev);
+ +	}
+ +	goto out;
+ +}
+ +
+++=======
+++>>>>>>> 02839cc8d72b (rtnl: move rtnl_newlink_create())
+  static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
+  			struct netlink_ext_ack *extack)
+  {
+* Unmerged path net/core/rtnetlink.c