From 0d6f12c130fda24bc0c18341c173e5b235fe3f67 Mon Sep 17 00:00:00 2001 From: oh_ci Date: Mon, 31 Mar 2025 02:50:17 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!1776=20?= =?UTF-8?q?:=20msater=20CVE=E5=90=8C=E6=AD=A5'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- drivers/media/usb/uvc/uvc_status.c | 1 - drivers/ptp/ptp_clock.c | 8 -------- fs/ocfs2/symlink.c | 5 ++--- kernel/printk/printk.c | 2 +- kernel/rcu/srcutree.c | 6 ++---- kernel/trace/bpf_trace.c | 2 +- net/bluetooth/l2cap_sock.c | 3 +-- net/core/sysctl_net_core.c | 5 +---- 8 files changed, 8 insertions(+), 24 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c index 6edf491dd873..73725051cc16 100644 --- a/drivers/media/usb/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c @@ -269,7 +269,6 @@ int uvc_status_init(struct uvc_device *dev) dev->int_urb = usb_alloc_urb(0, GFP_KERNEL); if (dev->int_urb == NULL) { kfree(dev->status); - dev->status = NULL; return -ENOMEM; } diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c index bfbde4eaddf0..e408dae648a6 100644 --- a/drivers/ptp/ptp_clock.c +++ b/drivers/ptp/ptp_clock.c @@ -192,11 +192,6 @@ static int ptp_enable(struct ptp_clock_info *ptp, struct ptp_clock_request *requ return -EOPNOTSUPP; } -static int ptp_enable(struct ptp_clock_info *ptp, struct ptp_clock_request *request, int on) -{ - return -EOPNOTSUPP; -} - static void ptp_aux_kworker(struct kthread_work *work) { struct ptp_clock *ptp = container_of(work, struct ptp_clock, @@ -242,9 +237,6 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, mutex_init(&ptp->pincfg_mux); init_waitqueue_head(&ptp->tsev_wq); - if (!ptp->info->enable) - ptp->info->enable = ptp_enable; - if (!ptp->info->enable) ptp->info->enable = ptp_enable; diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c index f3e80c00ca69..94cfacc9bad7 100644 --- a/fs/ocfs2/symlink.c +++ b/fs/ocfs2/symlink.c @@ -66,7 +66,7 @@ static int ocfs2_fast_symlink_readpage(struct file *unused, struct page *page) if (status < 0) { mlog_errno(status); - goto out; + return status; } fe = (struct ocfs2_dinode *) bh->b_data; @@ -77,10 +77,9 @@ static int ocfs2_fast_symlink_readpage(struct file *unused, struct page *page) memcpy(kaddr, link, len + 1); kunmap_atomic(kaddr); SetPageUptodate(page); -out: unlock_page(page); brelse(bh); - return status; + return 0; } const struct address_space_operations ocfs2_fast_symlink_aops = { diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index fd351283f5eb..17a310dcb6d9 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -420,7 +420,7 @@ static u64 clear_seq; /* record buffer */ #define LOG_ALIGN __alignof__(unsigned long) #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT) -#define LOG_BUF_LEN_MAX ((u32)1 << 31) +#define LOG_BUF_LEN_MAX (u32)(1 << 31) static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN); static char *log_buf = __log_buf; static u32 log_buf_len = __LOG_BUF_LEN; diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c index 375a1ea05c22..1ca734767b9d 100644 --- a/kernel/rcu/srcutree.c +++ b/kernel/rcu/srcutree.c @@ -390,11 +390,9 @@ void cleanup_srcu_struct(struct srcu_struct *ssp) return; /* Forgot srcu_barrier(), so just leak it! */ } if (WARN_ON(rcu_seq_state(READ_ONCE(ssp->srcu_gp_seq)) != SRCU_STATE_IDLE) || - WARN_ON(rcu_seq_current(&ssp->srcu_gp_seq) != ssp->srcu_gp_seq_needed) || WARN_ON(srcu_readers_active(ssp))) { - pr_info("%s: Active srcu_struct %p read state: %d gp state: %lu/%lu\n", - __func__, ssp, rcu_seq_state(READ_ONCE(ssp->srcu_gp_seq)), - rcu_seq_current(&ssp->srcu_gp_seq), ssp->srcu_gp_seq_needed); + pr_info("%s: Active srcu_struct %p state: %d\n", + __func__, ssp, rcu_seq_state(READ_ONCE(ssp->srcu_gp_seq))); return; /* Caller forgot to stop doing call_srcu()? */ } free_percpu(ssp->sda); diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index c62beae65e06..5b9b7fdd7b9c 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -1081,7 +1081,7 @@ static int bpf_send_signal_common(u32 sig, enum pid_type type) if (unlikely(is_global_init(current))) return -EPERM; - if (!preemptible()) { + if (irqs_disabled()) { /* Do an early check on signal validity. Otherwise, * the error is lost in deferred irq_work. */ diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index b1663868a600..d878f422fc02 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1863,8 +1863,7 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, chan = l2cap_chan_create(); if (!chan) { sk_free(sk); - if (sock) - sock->sk = NULL; + sock->sk = NULL; return NULL; } diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 3640be19a795..0dfe9f255ab3 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -239,7 +239,7 @@ static int proc_do_dev_weight(struct ctl_table *table, int write, int ret, weight; mutex_lock(&dev_weight_mutex); - ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); + ret = proc_dointvec(table, write, buffer, lenp, ppos); if (!ret && write) { weight = READ_ONCE(weight_p); WRITE_ONCE(dev_rx_weight, weight * dev_weight_rx_bias); @@ -351,7 +351,6 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_do_dev_weight, - .extra1 = SYSCTL_ONE, }, { .procname = "dev_weight_rx_bias", @@ -359,7 +358,6 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_do_dev_weight, - .extra1 = SYSCTL_ONE, }, { .procname = "dev_weight_tx_bias", @@ -367,7 +365,6 @@ static struct ctl_table net_core_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = proc_do_dev_weight, - .extra1 = SYSCTL_ONE, }, { .procname = "netdev_max_backlog", -- Gitee