Open Build Service

_service:tar_scm_kernel_repo:kernel.spec Changed

@@ -12,7 +12,7 @@
 
 %global KernelVer %{version}-%{release}.%{_target_cpu}
 
-%global hulkrelease 2402.1.0
+%global hulkrelease 2402.4.0
 
 %define with_patch 0
 
@@ -32,7 +32,7 @@
 
 Name:	 kernel
 Version: 4.19.90
-Release: %{hulkrelease}.0237
+Release: %{hulkrelease}.0238
 Summary: Linux Kernel
 License: GPLv2
 URL:	 http://www.kernel.org/
@@ -809,6 +809,29 @@
 
 %changelog
 
+* Mon Feb 05 2024 Zhang Changzhong <zhangchangzhong@huawei.com> - 4.19.90-2402.4.0.0238
+- !4454  netfilter: nf_tables: reject QUEUE/DROP verdict parameters
+- netfilter: nf_tables: reject QUEUE/DROP verdict parameters
+- !4411 v2  drm/atomic: Fix potential use-after-free in nonblocking commits
+- !4412 v3  Save and restore msg_namelen in sock_sendmsg
+- net: Save and restore msg_namelen in sock_sendmsg
+- net: prevent rewrite of msg_name in sock_sendmsg()
+- !4399  net: dst: Optimized route gc
+- drm/atomic: Fix potential use-after-free in nonblocking commits
+- !4392 linux-4.19.y inclusion
+- !4369  mm/filemap: avoid buffered read/write race to read inconsistent data
+- net/dst: use a smaller percpu_counter batch for dst entries accounting
+- net: add a route cache full diagnostic message
+- net: check dev->gso_max_size in gso_features_check()
+- net: warn if gso_type isn't set for a GSO SKB
+- mm: fix unmap_mapping_range high bits shift bug
+- x86/alternatives: Sync core before enabling interrupts
+- mm/filemap: avoid buffered read/write race to read inconsistent data
+- !4360  net/sched: sch_hfsc: upgrade 'rt' to 'sc' when it becomes a inner curve
+- !4320  io_uring/af_unix: disable sending io_uring over sockets
+- net/sched: sch_hfsc: upgrade 'rt' to 'sc' when it becomes a inner curve
+- io_uring/af_unix: disable sending io_uring over sockets
+
 * Tue Jan 30 2024 Zhang Changzhong <zhangchangzhong@huawei.com> - 4.19.90-2402.1.0.0237
 - !4277  fs:/dcache.c: fix negative dentry limit not complete problem
 - !4288  net/rds: Fix UBSAN: array-index-out-of-bounds in rds_cmsg_recv

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/arch/x86/kernel/alternative.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/drivers/gpu/drm/drm_atomic.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/fs/io_uring.c Changed

@@ -7220,49 +7220,6 @@
 	return ret;
 }
 
-static int io_sqe_file_register(struct io_ring_ctx *ctx, struct file *file,
-				int index)
-{
-#if defined(CONFIG_UNIX)
-	struct sock *sock = ctx->ring_sock->sk;
-	struct sk_buff_head *head = &sock->sk_receive_queue;
-	struct sk_buff *skb;
-
-	/*
-	 * See if we can merge this file into an existing skb SCM_RIGHTS
-	 * file set. If there's no room, fall back to allocating a new skb
-	 * and filling it in.
-	 */
-	spin_lock_irq(&head->lock);
-	skb = skb_peek(head);
-	if (skb) {
-		struct scm_fp_list *fpl = UNIXCB(skb).fp;
-
-		if (fpl->count < SCM_MAX_FD) {
-			__skb_unlink(skb, head);
-			spin_unlock_irq(&head->lock);
-			fpl->fp[fpl->count] = get_file(file);
-			unix_inflight(fpl->user, fpl->fp[fpl->count]);
-			fpl->count++;
-			spin_lock_irq(&head->lock);
-			__skb_queue_head(head, skb);
-		} else {
-			skb = NULL;
-		}
-	}
-	spin_unlock_irq(&head->lock);
-
-	if (skb) {
-		fput(file);
-		return 0;
-	}
-
-	return __io_sqe_files_scm(ctx, 1, index);
-#else
-	return 0;
-#endif
-}
-
 static int io_queue_file_removal(struct fixed_file_data *data,
 				 struct file *file)
 {
@@ -7342,12 +7299,6 @@
 				break;
 			}
 			table->files[index] = file;
-			err = io_sqe_file_register(ctx, file, i);
-			if (err) {
-				table->files[index] = NULL;
-				fput(file);
-				break;
-			}
 		}
 		nr_args--;
 		done++;

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/include/net/dst_ops.h Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/mm/filemap.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/mm/memory.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/net/core/dev.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/net/core/dst.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/net/core/scm.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/net/ipv6/route.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/net/netfilter/nf_tables_api.c Changed

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/net/sched/sch_hfsc.c Changed

@@ -913,6 +913,14 @@
 	cl->cl_flags |= HFSC_USC;
 }
 
+static void
+hfsc_upgrade_rt(struct hfsc_class *cl)
+{
+	cl->cl_fsc = cl->cl_rsc;
+	rtsc_init(&cl->cl_virtual, &cl->cl_fsc, cl->cl_vt, cl->cl_total);
+	cl->cl_flags |= HFSC_FSC;
+}
+
 static const struct nla_policy hfsc_policy[TCA_HFSC_MAX + 1] = {
 	[TCA_HFSC_RSC]	= { .len = sizeof(struct tc_service_curve) },
 	[TCA_HFSC_FSC]	= { .len = sizeof(struct tc_service_curve) },
@@ -1021,10 +1029,6 @@
 		if (parent == NULL)
 			return -ENOENT;
 	}
-	if (!(parent->cl_flags & HFSC_FSC) && parent != &q->root) {
-		NL_SET_ERR_MSG(extack, "Invalid parent - parent class must have FSC");
-		return -EINVAL;
-	}
 
 	if (classid == 0 || TC_H_MAJ(classid ^ sch->handle) != 0)
 		return -EINVAL;
@@ -1077,6 +1081,12 @@
 	cl->cf_tree = RB_ROOT;
 
 	sch_tree_lock(sch);
+	/* Check if the inner class is a misconfigured 'rt' */
+	if (!(parent->cl_flags & HFSC_FSC) && parent != &q->root) {
+		NL_SET_ERR_MSG(extack,
+			       "Forced curve change on parent 'rt' to 'sc'");
+		hfsc_upgrade_rt(parent);
+	}
 	qdisc_class_hash_insert(&q->clhash, &cl->cl_common);
 	list_add_tail(&cl->siblings, &parent->children);
 	if (parent->level == 0)

_service:recompress:tar_scm_kernel_repo:kernel.tar.gz/net/socket.c Changed

@@ -653,13 +653,32 @@
 	return ret;
 }
 
-int sock_sendmsg(struct socket *sock, struct msghdr *msg)
+static int __sock_sendmsg(struct socket *sock, struct msghdr *msg)
 {
 	int err = security_socket_sendmsg(sock, msg,
 					  msg_data_left(msg));
 
 	return err ?: sock_sendmsg_nosec(sock, msg);
 }
+
+int sock_sendmsg(struct socket *sock, struct msghdr *msg)
+{
+	struct sockaddr_storage *save_addr = (struct sockaddr_storage *)msg->msg_name;
+	struct sockaddr_storage address;
+	int save_len = msg->msg_namelen;
+	int ret;
+
+	if (msg->msg_name) {
+		memcpy(&address, msg->msg_name, msg->msg_namelen);
+		msg->msg_name = &address;
+	}
+
+	ret = __sock_sendmsg(sock, msg);
+	msg->msg_name = save_addr;
+	msg->msg_namelen = save_len;
+
+	return ret;
+}
 EXPORT_SYMBOL(sock_sendmsg);
 
 /**
@@ -963,7 +982,7 @@
 	if (sock->type == SOCK_SEQPACKET)
 		msg.msg_flags |= MSG_EOR;
 
-	res = sock_sendmsg(sock, &msg);
+	res = __sock_sendmsg(sock, &msg);
 	*from = msg.msg_iter;
 	return res;
 }
@@ -1940,7 +1959,7 @@
 	if (sock->file->f_flags & O_NONBLOCK)
 		flags |= MSG_DONTWAIT;
 	msg.msg_flags = flags;
-	err = sock_sendmsg(sock, &msg);
+	err = __sock_sendmsg(sock, &msg);
 
 out_put:
 	fput_light(sock->file, fput_needed);
@@ -2272,7 +2291,7 @@
 		err = sock_sendmsg_nosec(sock, msg_sys);
 		goto out_freectl;
 	}
-	err = sock_sendmsg(sock, msg_sys);
+	err = __sock_sendmsg(sock, msg_sys);
 	/*
 	 * If this is sendmmsg() and sending to current destination address was
 	 * successful, remember it.

_service:tar_scm_kernel_repo:SOURCE Changed

Changes of Revision 350