4.14.201-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 1/70 vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock
In reply to Greg Kroah-HartmanFrom: Stefano Garzarella <[email protected]>
[ Upstream commit 9c7a5582f5d720dc35cfcc42ccaded69f0642e4a ]
Some callbacks used by the upper layers can run while we are in the .remove(). A potential use-after-free can happen, because we free the_virtio_vsock without knowing if the callbacks are over or not.
To solve this issue we move the assignment of the_virtio_vsock at the end of .probe(), when we finished all the initialization, and at the beginning of .remove(), before to release resources.
For the same reason, we do the same also for the vdev->priv.
We use RCU to be sure that all callbacks that use the_virtio_vsock ended before freeing it. This is not required for callbacks that use vdev->priv, because after the vdev->config->del_vqs() we are sure that they are ended and will no longer be invoked.
We also take the mutex during the .remove() to avoid that .probe() can run while we are resetting the device.
--- net/vmw_vsock/virtio_transport.c | 70 +++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 24 deletions(-)
net/vmw_vsock/virtio_transport.c +46 -24
@@ -66,19 +66,22 @@ struct virtio_vsock {u32 guest_cid; }; -static struct virtio_vsock *virtio_vsock_get (void ) -{ -return the_virtio_vsock; -} -static u32 virtio_transport_get_local_cid (void ) { -struct virtio_vsock *vsock =virtio_vsock_get (); +struct virtio_vsock *vsock; +u32 ret; -if (!vsock) -return VMADDR_CID_ANY ; +rcu_read_lock (); + vsock =rcu_dereference (the_virtio_vsock); +if (!vsock) { + ret =VMADDR_CID_ANY ; + goto out_rcu; + } -return vsock->guest_cid; + ret = vsock->guest_cid; +out_rcu: +rcu_read_unlock (); +return ret; }static void virtio_transport_loopback_work (struct work_struct *work)
@@ -198,14 +201,18 @@ virtio_transport_send_pkt(struct virtio_vsock_pkt *pkt)struct virtio_vsock *vsock;int len = pkt->len; - vsock =virtio_vsock_get (); +rcu_read_lock (); + vsock =rcu_dereference (the_virtio_vsock);if (!vsock) {virtio_transport_free_pkt (pkt); -return -ENODEV ; + len = -ENODEV ; + goto out_rcu; } -if (le64_to_cpu (pkt->hdr.dst_cid) == vsock->guest_cid) -return virtio_transport_send_pkt_loopback (vsock, pkt); +if (le64_to_cpu (pkt->hdr.dst_cid) == vsock->guest_cid) { + len =virtio_transport_send_pkt_loopback (vsock, pkt); + goto out_rcu; + }if (pkt->reply)atomic_inc (&vsock->queued_replies);
@@ -215,6 +222,9 @@ virtio_transport_send_pkt(struct virtio_vsock_pkt *pkt)spin_unlock_bh (&vsock->send_pkt_list_lock);queue_work (virtio_vsock_workqueue, &vsock->send_pkt_work); + +out_rcu: +rcu_read_unlock ();return len; }
@@ -223,12 +233,14 @@ virtio_transport_cancel_pkt(struct vsock_sock *vsk) {struct virtio_vsock *vsock;struct virtio_vsock_pkt *pkt, *n; -int cnt =0 ; +int cnt =0 , ret;LIST_HEAD (freeme); - vsock =virtio_vsock_get (); +rcu_read_lock (); + vsock =rcu_dereference (the_virtio_vsock);if (!vsock) { -return -ENODEV ; + ret = -ENODEV ; + goto out_rcu; }spin_lock_bh (&vsock->send_pkt_list_lock);
@@ -256,7 +268,11 @@ virtio_transport_cancel_pkt(struct vsock_sock *vsk)queue_work (virtio_vsock_workqueue, &vsock->rx_work); } -return 0 ; + ret =0 ; + +out_rcu: +rcu_read_unlock (); +return ret; }static void virtio_vsock_rx_fill (struct virtio_vsock *vsock)
@@ -566,7 +582,8 @@ static int virtio_vsock_probe(struct virtio_device *vdev)return ret;/* Only one virtio-vsock device per guest is supported */ -if (the_virtio_vsock) { +if (rcu_dereference_protected (the_virtio_vsock, +lockdep_is_held (&the_virtio_vsock_mutex))) { ret = -EBUSY ; goto out; }
@@ -591,8 +608,6 @@ static int virtio_vsock_probe(struct virtio_device *vdev) vsock->rx_buf_max_nr =0 ;atomic_set (&vsock->queued_replies,0 ); - vdev->priv = vsock; - the_virtio_vsock = vsock;mutex_init (&vsock->tx_lock);mutex_init (&vsock->rx_lock);mutex_init (&vsock->event_lock);
@@ -614,6 +629,9 @@ static int virtio_vsock_probe(struct virtio_device *vdev)virtio_vsock_event_fill (vsock);mutex_unlock (&vsock->event_lock); + vdev->priv = vsock; +rcu_assign_pointer (the_virtio_vsock, vsock); +mutex_unlock (&the_virtio_vsock_mutex);return 0 ;
@@ -628,6 +646,12 @@ static void virtio_vsock_remove(struct virtio_device *vdev)struct virtio_vsock *vsock = vdev->priv;struct virtio_vsock_pkt *pkt; +mutex_lock (&the_virtio_vsock_mutex); + + vdev->priv =NULL ; +rcu_assign_pointer (the_virtio_vsock,NULL ); +synchronize_rcu (); +flush_work (&vsock->loopback_work);flush_work (&vsock->rx_work);flush_work (&vsock->tx_work);
@@ -667,12 +691,10 @@ static void virtio_vsock_remove(struct virtio_device *vdev) }spin_unlock_bh (&vsock->loopback_list_lock); -mutex_lock (&the_virtio_vsock_mutex); - the_virtio_vsock =NULL ; -mutex_unlock (&the_virtio_vsock_mutex); - vdev->config->del_vqs (vdev); +mutex_unlock (&the_virtio_vsock_mutex); +kfree (vsock); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 3/70 vsock/virtio: add transport parameter to the virtio_transport_reset_no_sock()
In reply to Greg Kroah-HartmanFrom: Stefano Garzarella <[email protected]>
[ Upstream commit 4c7246dc45e2706770d5233f7ce1597a07e069ba ]
We are going to add 'struct vsock_sock *' parameter to virtio_transport_get_ops().
In some cases, like in the virtio_transport_reset_no_sock(), we don't have any socket assigned to the packet received, so we can't use the virtio_transport_get_ops().
In order to allow virtio_transport_reset_no_sock() to use the '.send_pkt' callback from the 'vhost_transport' or 'virtio_transport', we add the 'struct virtio_transport *' to it and to its caller:virtio_transport_recv_pkt().
We moved the 'vhost_transport' and 'virtio_transport' definition, to pass their address to the virtio_transport_recv_pkt().
--- drivers/vhost/vsock.c | 94 +++++++------- include/linux/virtio_vsock.h | 3 +- net/vmw_vsock/virtio_transport.c | 160 ++++++++++++------------ net/vmw_vsock/virtio_transport_common.c | 12 +- 4 files changed, 135 insertions(+), 134 deletions(-)
drivers/vhost/vsock.c +47 -47
@@ -383,6 +383,52 @@ static bool vhost_vsock_more_replies(struct vhost_vsock *vsock)return val < vq->num; } +static struct virtio_transport vhost_transport = { + .transport = { + .get_local_cid = vhost_transport_get_local_cid, + + .init = virtio_transport_do_socket_init, + .destruct = virtio_transport_destruct, + .release = virtio_transport_release, + .connect = virtio_transport_connect, + .shutdown = virtio_transport_shutdown, + .cancel_pkt = vhost_transport_cancel_pkt, + + .dgram_enqueue = virtio_transport_dgram_enqueue, + .dgram_dequeue = virtio_transport_dgram_dequeue, + .dgram_bind = virtio_transport_dgram_bind, + .dgram_allow = virtio_transport_dgram_allow, + + .stream_enqueue = virtio_transport_stream_enqueue, + .stream_dequeue = virtio_transport_stream_dequeue, + .stream_has_data = virtio_transport_stream_has_data, + .stream_has_space = virtio_transport_stream_has_space, + .stream_rcvhiwat = virtio_transport_stream_rcvhiwat, + .stream_is_active = virtio_transport_stream_is_active, + .stream_allow = virtio_transport_stream_allow, + + .notify_poll_in = virtio_transport_notify_poll_in, + .notify_poll_out = virtio_transport_notify_poll_out, + .notify_recv_init = virtio_transport_notify_recv_init, + .notify_recv_pre_block = virtio_transport_notify_recv_pre_block, + .notify_recv_pre_dequeue = virtio_transport_notify_recv_pre_dequeue, + .notify_recv_post_dequeue = virtio_transport_notify_recv_post_dequeue, + .notify_send_init = virtio_transport_notify_send_init, + .notify_send_pre_block = virtio_transport_notify_send_pre_block, + .notify_send_pre_enqueue = virtio_transport_notify_send_pre_enqueue, + .notify_send_post_enqueue = virtio_transport_notify_send_post_enqueue, + + .set_buffer_size = virtio_transport_set_buffer_size, + .set_min_buffer_size = virtio_transport_set_min_buffer_size, + .set_max_buffer_size = virtio_transport_set_max_buffer_size, + .get_buffer_size = virtio_transport_get_buffer_size, + .get_min_buffer_size = virtio_transport_get_min_buffer_size, + .get_max_buffer_size = virtio_transport_get_max_buffer_size, + }, + + .send_pkt = vhost_transport_send_pkt, +}; +static void vhost_vsock_handle_tx_kick (struct vhost_work *work) { struct vhost_virtqueue *vq = container_of(work, struct vhost_virtqueue,
@@ -439,7 +485,7 @@ static void vhost_vsock_handle_tx_kick(struct vhost_work *work)if (le64_to_cpu (pkt->hdr.src_cid) == vsock->guest_cid &&le64_to_cpu (pkt->hdr.dst_cid) ==vhost_transport_get_local_cid ()) -virtio_transport_recv_pkt (pkt); +virtio_transport_recv_pkt (&vhost_transport, pkt);else virtio_transport_free_pkt (pkt);
@@ -780,52 +826,6 @@ static struct miscdevice vhost_vsock_misc = { .fops = &vhost_vsock_fops, }; -static struct virtio_transport vhost_transport = { - .transport = { - .get_local_cid = vhost_transport_get_local_cid, - - .init = virtio_transport_do_socket_init, - .destruct = virtio_transport_destruct, - .release = virtio_transport_release, - .connect = virtio_transport_connect, - .shutdown = virtio_transport_shutdown, - .cancel_pkt = vhost_transport_cancel_pkt, - - .dgram_enqueue = virtio_transport_dgram_enqueue, - .dgram_dequeue = virtio_transport_dgram_dequeue, - .dgram_bind = virtio_transport_dgram_bind, - .dgram_allow = virtio_transport_dgram_allow, - - .stream_enqueue = virtio_transport_stream_enqueue, - .stream_dequeue = virtio_transport_stream_dequeue, - .stream_has_data = virtio_transport_stream_has_data, - .stream_has_space = virtio_transport_stream_has_space, - .stream_rcvhiwat = virtio_transport_stream_rcvhiwat, - .stream_is_active = virtio_transport_stream_is_active, - .stream_allow = virtio_transport_stream_allow, - - .notify_poll_in = virtio_transport_notify_poll_in, - .notify_poll_out = virtio_transport_notify_poll_out, - .notify_recv_init = virtio_transport_notify_recv_init, - .notify_recv_pre_block = virtio_transport_notify_recv_pre_block, - .notify_recv_pre_dequeue = virtio_transport_notify_recv_pre_dequeue, - .notify_recv_post_dequeue = virtio_transport_notify_recv_post_dequeue, - .notify_send_init = virtio_transport_notify_send_init, - .notify_send_pre_block = virtio_transport_notify_send_pre_block, - .notify_send_pre_enqueue = virtio_transport_notify_send_pre_enqueue, - .notify_send_post_enqueue = virtio_transport_notify_send_post_enqueue, - - .set_buffer_size = virtio_transport_set_buffer_size, - .set_min_buffer_size = virtio_transport_set_min_buffer_size, - .set_max_buffer_size = virtio_transport_set_max_buffer_size, - .get_buffer_size = virtio_transport_get_buffer_size, - .get_min_buffer_size = virtio_transport_get_min_buffer_size, - .get_max_buffer_size = virtio_transport_get_max_buffer_size, - }, - - .send_pkt = vhost_transport_send_pkt, -}; -static int __init vhost_vsock_init (void ) {int ret;
include/linux/virtio_vsock.h +2 -1
@@ -149,7 +149,8 @@ virtio_transport_dgram_enqueue(struct vsock_sock *vsk,void virtio_transport_destruct (struct vsock_sock *vsk); -void virtio_transport_recv_pkt (struct virtio_vsock_pkt *pkt); +void virtio_transport_recv_pkt (struct virtio_transport *t, +struct virtio_vsock_pkt *pkt);void virtio_transport_free_pkt (struct virtio_vsock_pkt *pkt);void virtio_transport_inc_tx_pkt (struct virtio_vsock_sock *vvs,struct virtio_vsock_pkt *pkt);u32 virtio_transport_get_credit (struct virtio_vsock_sock *vvs,u32 wanted);
net/vmw_vsock/virtio_transport.c +80 -80
178 lines not on this page · raw message
net/vmw_vsock/virtio_transport_common.c +6 -6
@@ -669,9 +669,9 @@ static int virtio_transport_reset(struct vsock_sock *vsk,/* Normally packets are associated with a socket. There may be no socket if an * attempt was made to connect to a socket that does not exist. */ -static int virtio_transport_reset_no_sock (struct virtio_vsock_pkt *pkt) +static int virtio_transport_reset_no_sock (const struct virtio_transport *t, +struct virtio_vsock_pkt *pkt) { -const struct virtio_transport *t;struct virtio_vsock_pkt *reply;struct virtio_vsock_pkt_info info = { .op =VIRTIO_VSOCK_OP_RST ,
@@ -691,7 +691,6 @@ static int virtio_transport_reset_no_sock(struct virtio_vsock_pkt *pkt)if (!reply)return -ENOMEM ; - t =virtio_transport_get_ops ();if (!t) {virtio_transport_free_pkt (reply);return -ENOTCONN ;
@@ -989,7 +988,8 @@ static bool virtio_transport_space_update(struct sock *sk,/* We are under the virtio-vsock's vsock->rx_lock or vhost-vsock's vq->mutex * lock. */ -void virtio_transport_recv_pkt (struct virtio_vsock_pkt *pkt) +void virtio_transport_recv_pkt (struct virtio_transport *t, +struct virtio_vsock_pkt *pkt) {struct sockaddr_vm src, dst;struct vsock_sock *vsk;
@@ -1011,7 +1011,7 @@ void virtio_transport_recv_pkt(struct virtio_vsock_pkt *pkt) le32_to_cpu(pkt->hdr.fwd_cnt));if (le16_to_cpu (pkt->hdr.type) !=VIRTIO_VSOCK_TYPE_STREAM ) { - (void )virtio_transport_reset_no_sock (pkt); + (void )virtio_transport_reset_no_sock (t, pkt); goto free_pkt; }
@@ -1022,7 +1022,7 @@ void virtio_transport_recv_pkt(struct virtio_vsock_pkt *pkt)if (!sk) { sk =vsock_find_bound_socket (&dst);if (!sk) { - (void )virtio_transport_reset_no_sock (pkt); + (void )virtio_transport_reset_no_sock (t, pkt); goto free_pkt; } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 2/70 vsock/virtio: stop workers during the .remove()
In reply to Greg Kroah-HartmanFrom: Stefano Garzarella <[email protected]>
[ Upstream commit 17dd1367389cfe7f150790c83247b68e0c19d106 ]
Before to call vdev->config->reset(vdev) we need to be sure that no one is accessing the device, for this reason, we add new variables in the struct virtio_vsock to stop the workers during the .remove().
This patch also add few comments before vdev->config->reset(vdev) and vdev->config->del_vqs(vdev).
--- net/vmw_vsock/virtio_transport.c | 51 +++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-)
net/vmw_vsock/virtio_transport.c +50 -1
@@ -39,6 +39,7 @@ struct virtio_vsock {* must be accessed with tx_lock held. */ struct mutex tx_lock; +bool tx_run;struct work_struct send_pkt_work;spinlock_t send_pkt_list_lock;
@@ -54,6 +55,7 @@ struct virtio_vsock {* must be accessed with rx_lock held. */ struct mutex rx_lock; +bool rx_run;int rx_buf_nr;int rx_buf_max_nr;
@@ -61,6 +63,7 @@ struct virtio_vsock {* vqs[VSOCK_VQ_EVENT] must be accessed with event_lock held. */ struct mutex event_lock; +bool event_run;struct virtio_vsock_event event_list[8 ];u32 guest_cid;
@@ -95,6 +98,10 @@ static void virtio_transport_loopback_work(struct work_struct *work)spin_unlock_bh (&vsock->loopback_list_lock);mutex_lock (&vsock->rx_lock); + +if (!vsock->rx_run) + goto out; +while (!list_empty (&pkts)) {struct virtio_vsock_pkt *pkt;
@@ -103,6 +110,7 @@ static void virtio_transport_loopback_work(struct work_struct *work)virtio_transport_recv_pkt (pkt); } +out:mutex_unlock (&vsock->rx_lock); }
@@ -131,6 +139,9 @@ virtio_transport_send_pkt_work(struct work_struct *work)mutex_lock (&vsock->tx_lock); +if (!vsock->tx_run) + goto out; + vq = vsock->vqs[VSOCK_VQ_TX ];for (;;) {
@@ -189,6 +200,7 @@ virtio_transport_send_pkt_work(struct work_struct *work)if (added)virtqueue_kick (vq); +out:mutex_unlock (&vsock->tx_lock);if (restart_rx)
@@ -324,6 +336,10 @@ static void virtio_transport_tx_work(struct work_struct *work) vq = vsock->vqs[VSOCK_VQ_TX ];mutex_lock (&vsock->tx_lock); + +if (!vsock->tx_run) + goto out; + do { struct virtio_vsock_pkt *pkt; unsigned int len;
@@ -334,6 +350,8 @@ static void virtio_transport_tx_work(struct work_struct *work) added = true; } }while (!virtqueue_enable_cb (vq)); + +out:mutex_unlock (&vsock->tx_lock);if (added)
@@ -362,6 +380,9 @@ static void virtio_transport_rx_work(struct work_struct *work)mutex_lock (&vsock->rx_lock); +if (!vsock->rx_run) + goto out; + do { virtqueue_disable_cb(vq); for (;;) {
@@ -471,6 +492,9 @@ static void virtio_transport_event_work(struct work_struct *work)mutex_lock (&vsock->event_lock); +if (!vsock->event_run) + goto out; + do { struct virtio_vsock_event *event; unsigned int len;
@@ -485,7 +509,7 @@ static void virtio_transport_event_work(struct work_struct *work) }while (!virtqueue_enable_cb (vq));virtqueue_kick (vsock->vqs[VSOCK_VQ_EVENT ]); - +out:mutex_unlock (&vsock->event_lock); }
@@ -621,12 +645,18 @@ static int virtio_vsock_probe(struct virtio_device *vdev)INIT_WORK (&vsock->send_pkt_work, virtio_transport_send_pkt_work);INIT_WORK (&vsock->loopback_work, virtio_transport_loopback_work); +mutex_lock (&vsock->tx_lock); + vsock->tx_run = true; +mutex_unlock (&vsock->tx_lock); +mutex_lock (&vsock->rx_lock);virtio_vsock_rx_fill (vsock); + vsock->rx_run = true;mutex_unlock (&vsock->rx_lock);mutex_lock (&vsock->event_lock);virtio_vsock_event_fill (vsock); + vsock->event_run = true;mutex_unlock (&vsock->event_lock); vdev->priv = vsock;
@@ -661,6 +691,24 @@ static void virtio_vsock_remove(struct virtio_device *vdev)/* Reset all connected sockets when the device disappear */ vsock_for_each_connected_socket (virtio_vsock_reset_sock); +/* Stop all work handlers to make sure no one is accessing the device, +* so we can safely call vdev->config->reset(). +*/ +mutex_lock (&vsock->rx_lock); + vsock->rx_run = false; +mutex_unlock (&vsock->rx_lock); + +mutex_lock (&vsock->tx_lock); + vsock->tx_run = false; +mutex_unlock (&vsock->tx_lock); + +mutex_lock (&vsock->event_lock); + vsock->event_run = false; +mutex_unlock (&vsock->event_lock); + +/* Flush all device writes and interrupts, device will not use any +* more buffers. +*/ vdev->config->reset (vdev);mutex_lock (&vsock->rx_lock);
@@ -691,6 +739,7 @@ static void virtio_vsock_remove(struct virtio_device *vdev) }spin_unlock_bh (&vsock->loopback_list_lock); +/* Delete virtqueues and flush outstanding callbacks if any */ vdev->config->del_vqs (vdev);mutex_unlock (&the_virtio_vsock_mutex);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 4/70 net: virtio_vsock: Enhance connection semantics
In reply to Greg Kroah-HartmanFrom: Sebastien Boeuf <[email protected]>
[ Upstream commit df12eb6d6cd920ab2f0e0a43cd6e1c23a05cea91 ]
Whenever the vsock backend on the host sends a packet through the RX queue, it expects an answer on the TX queue. Unfortunately, there is one case where the host side will hang waiting for the answer and might effectively never recover if no timeout mechanism was implemented.
This issue happens when the guest side starts binding to the socket, which insert a new bound socket into the list of already bound sockets. At this time, we expect the guest to also start listening, which will trigger the sk_state to move from TCP_CLOSE to TCP_LISTEN. The problem occurs if the host side queued a RX packet and triggered an interrupt right between the end of the binding process and the beginning of the listening process. In this specific case, the function processing the packet virtio_transport_recv_pkt() will find a bound socket, which means it will hit the switch statement checking for the sk_state, but the state won't be changed into TCP_LISTEN yet, which leads the code to pick the default statement. This default statement will only free the buffer, while it should also respond to the host side, by sending a packet on its TX queue.
In order to simply fix this unfortunate chain of events, it is important that in case the default statement is entered, and because at this stage we know the host side is waiting for an answer, we must send back a packet containing the operation VIRTIO_VSOCK_OP_RST.
One could say that a proper timeout mechanism on the host side will be enough to avoid the backend to hang. But the point of this patch is to ensure the normal use case will be provided with proper responsiveness when it comes to establishing the connection.
--- net/vmw_vsock/virtio_transport_common.c | 1 + 1 file changed, 1 insertion(+)
net/vmw_vsock/virtio_transport_common.c +1 -0
@@ -1056,6 +1056,7 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,virtio_transport_free_pkt (pkt);break ;default : + (void )virtio_transport_reset_no_sock (t, pkt);virtio_transport_free_pkt (pkt);break ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 11/70 net: dec: de2104x: Increase receive ring size for Tulip
In reply to Greg Kroah-HartmanFrom: Lucy Yan <[email protected]>
[ Upstream commit ee460417d254d941dfea5fb7cff841f589643992 ]
Increase Rx ring size to address issue where hardware is reaching the receive work limit.
Before:
[ 102.223342] de2104x 0000:17:00.0 eth0: rx work limit reached [ 102.245695] de2104x 0000:17:00.0 eth0: rx work limit reached [ 102.251387] de2104x 0000:17:00.0 eth0: rx work limit reached [ 102.267444] de2104x 0000:17:00.0 eth0: rx work limit reached
--- drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/dec/tulip/de2104x.c +1 -1
@@ -91,7 +91,7 @@ MODULE_PARM_DESC (rx_copybreak, "de2104x Breakpoint at which Rx packets are copi#define DSL CONFIG_DE2104X_DSL#endif -#define DE_RX_RING_SIZE 64 +#define DE_RX_RING_SIZE 128#define DE_TX_RING_SIZE 64#define DE_RING_BYTES \ ((sizeof(struct de_desc) * DE_RX_RING_SIZE) + \
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 27/70 epoll: replace ->visited/visited_list with generation count
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit 18306c404abe18a0972587a6266830583c60c928 upstream.
removes the need to clear it, along with the races.
--- fs/eventpoll.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-)
fs/eventpoll.c +7 -19
@@ -223,8 +223,7 @@ struct eventpoll {struct file *file;/* used to optimize loop detection check */ -int visited; -struct list_head visited_list_link; +u64 gen;#ifdef CONFIG_NET_RX_BUSY_POLL /* used to track busy poll napi_id */
@@ -273,6 +272,8 @@ static long max_user_watches __read_most*/ static DEFINE_MUTEX (epmutex); +static u64 loop_check_gen =0 ; +/* Used to check for epoll file descriptor inclusion loops */ static struct nested_calls poll_loop_ncalls;
@@ -288,9 +289,6 @@ static struct kmem_cache *epi_cache __re/* Slab cache used to allocate "struct eppoll_entry" */ static struct kmem_cache *pwq_cache__read_mostly ; -/* Visited nodes during ep_loop_check(), so we can unset them when we finish */ -static LIST_HEAD (visited_list); -/* * List of files with newly added links, where we may need to limit the number * of emanating paths. Protected by the epmutex.
@@ -1877,13 +1875,12 @@ static int ep_loop_check_proc(void *privstruct epitem *epi;mutex_lock_nested (&ep->mtx, call_nests +1 ); - ep->visited =1 ; -list_add (&ep->visited_list_link, &visited_list); + ep->gen = loop_check_gen;for (rbp =rb_first_cached (&ep->rbr); rbp; rbp =rb_next (rbp)) { epi = rb_entry(rbp, struct epitem, rbn);if (unlikely (is_file_epoll (epi->ffd.file))) { ep_tovisit = epi->ffd.file->private_data; -if (ep_tovisit->visited) +if (ep_tovisit->gen == loop_check_gen)continue ; error = ep_call_nested(&poll_loop_ncalls, EP_MAX_NESTS, ep_loop_check_proc, epi->ffd.file,
@@ -1924,18 +1921,8 @@ static int ep_loop_check_proc(void *priv*/ static int ep_loop_check (struct eventpoll *ep,struct file *file) { -int ret; -struct eventpoll *ep_cur, *ep_next; - - ret =ep_call_nested (&poll_loop_ncalls,EP_MAX_NESTS , +return ep_call_nested (&poll_loop_ncalls,EP_MAX_NESTS , ep_loop_check_proc, file, ep, current); -/* clear visited list */ -list_for_each_entry_safe (ep_cur, ep_next, &visited_list, - visited_list_link) { - ep_cur->visited =0 ; -list_del (&ep_cur->visited_list_link); - } -return ret; }static void clear_tfile_check_list (void )
@@ -2152,6 +2139,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, in error_tgt_fput:if (full_check) {clear_tfile_check_list (); + loop_check_gen++;mutex_unlock (&epmutex); }
Greg Kroah-Hartman
maintainerPATCH 28/70 epoll: EPOLL_CTL_ADD: close the race in decision to take fast path
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit fe0a916c1eae8e17e86c3753d13919177d63ed7e upstream.
Checking for the lack of epitems refering to the epoll we want to insert into is not enough; we might have an insertion of that epoll into another one that has already collected the set of files to recheck for excessive reverse paths, but hasn't gotten to creating/inserting the epitem for it.
However, any such insertion in progress can be detected - it will update the generation count in our epoll when it's done looking through it for files to check. That gets done under ->mtx of our epoll and that allows us to detect that safely.
We are *not* holding epmutex here, so the generation count is not stable. However, since both the update of ep->gen by loop check and (later) insertion into ->f_ep_link are done with ep->mtx held, we are fine - the sequence is
grab epmutex bump loop_check_gen ... grab tep->mtx // 1 tep->gen = loop_check_gen ... drop tep->mtx // 2 ... grab tep->mtx // 3 ... insert into ->f_ep_link ... drop tep->mtx // 4 bump loop_check_gen drop epmutex
and if the fastpath check in another thread happens for that eventpoll, it can come
* before (1) - in that case fastpath is just fine
* after (4) - we'll see non-empty ->f_ep_link, slow path
taken
* between (2) and (3) - loop_check_gen is stable,
with ->mtx providing barriers and we end up taking slow path.
Note that ->f_ep_link emptiness check is slightly racy - we are protected against insertions into that list, but removals can happen right under us. Not a problem - in the worst case we'll end up taking a slow path for no good reason.
--- fs/eventpoll.c | 1 + 1 file changed, 1 insertion(+)
fs/eventpoll.c +1 -0
@@ -2079,6 +2079,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, inmutex_lock_nested (&ep->mtx,0 );if (op ==EPOLL_CTL_ADD ) {if (!list_empty (&f.file->f_ep_links) || + ep->gen == loop_check_gen ||is_file_epoll (tf.file)) { full_check =1 ;mutex_unlock (&ep->mtx);
Greg Kroah-Hartman
maintainerPATCH 10/70 drm/sun4i: mixer: Extend regmap max_register
In reply to Greg Kroah-HartmanFrom: Martin Cerveny <[email protected]>
[ Upstream commit 74ea06164cda81dc80e97790164ca533fd7e3087 ]
Better guess. Secondary CSC registers are from 0xF0000.
--- drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/sun4i/sun8i_mixer.c +1 -1
@@ -235,7 +235,7 @@ static struct regmap_config sun8i_mixer_regmap_config = { .reg_bits = 32, .val_bits = 32, .reg_stride = 4, - .max_register = 0xbfffc, /* guessed */ + .max_register = 0xffffc, /* guessed */ }; static int sun8i_mixer_bind(struct device *dev, struct device *master,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 12/70 rndis_host: increase sleep time in the query-response loop
In reply to Greg Kroah-HartmanFrom: Olympia Giannou <[email protected]>
[ Upstream commit 4202c9fdf03d79dedaa94b2c4cf574f25793d669 ]
Some WinCE devices face connectivity issues via the NDIS interface. They fail to register, resulting in -110 timeout errors and failures during the probe procedure.
In this kind of WinCE devices, the Windows-side ndis driver needs quite more time to be loaded and configured, so that the linux rndis host queries to them fail to be responded correctly on time.
More specifically, when INIT is called on the WinCE side - no other requests can be served by the Client and this results in a failed QUERY afterwards.
The increase of the waiting time on the side of the linux rndis host in the command-response loop leaves the INIT process to complete and respond to a QUERY, which comes afterwards. The WinCE devices with this special "feature" in their ndis driver are satisfied by this fix.
--- drivers/net/usb/rndis_host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/rndis_host.c +1 -1
@@ -213,7 +213,7 @@ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen)dev_dbg (&info->control->dev,"rndis response error, code %d\n" , retval); } -msleep (20 ); +msleep (40 ); }dev_dbg (&info->control->dev,"rndis response timeout\n" );return -ETIMEDOUT ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 13/70 drivers/net/wan/lapbether: Make skb->protocol consistent with the header
In reply to Greg Kroah-HartmanFrom: Xie He <[email protected]>
[ Upstream commit 83f9a9c8c1edc222846dc1bde6e3479703e8e5a3 ]
This driver is a virtual driver stacked on top of Ethernet interfaces.
When this driver transmits data on the Ethernet device, the skb->protocol setting is inconsistent with the Ethernet header prepended to the skb.
This causes a user listening on the Ethernet interface with an AF_PACKET socket, to see different sll_protocol values for incoming and outgoing frames, because incoming frames would have this value set by parsing the Ethernet header.
This patch changes the skb->protocol value for outgoing Ethernet frames, making it consistent with the Ethernet header prepended. This makes a user listening on the Ethernet device with an AF_PACKET socket, to see the same sll_protocol value for incoming and outgoing frames.
--- drivers/net/wan/lapbether.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wan/lapbether.c +2 -2
@@ -201,8 +201,6 @@ static void lapbeth_data_transmit(struct net_device *ndev, struct sk_buff *skb)struct net_device *dev;int size = skb->len; - skb->protocol =htons (ETH_P_X25 ); - ptr =skb_push (skb,2 ); *ptr++ = size %256 ;
@@ -213,6 +211,8 @@ static void lapbeth_data_transmit(struct net_device *ndev, struct sk_buff *skb) skb->dev = dev = lapbeth->ethdev; + skb->protocol =htons (ETH_P_DEC ); +skb_reset_network_header (skb);dev_hard_header (skb, dev,ETH_P_DEC , bcast_addr,NULL ,0 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 14/70 drivers/net/wan/hdlc: Set skb->protocol before transmitting
In reply to Greg Kroah-HartmanFrom: Xie He <[email protected]>
[ Upstream commit 9fb030a70431a2a2a1b292dbf0b2f399cc072c16 ]
This patch sets skb->protocol before transmitting frames on the HDLC device, so that a user listening on the HDLC device with an AF_PACKET socket will see outgoing frames' sll_protocol field correctly set and consistent with that of incoming frames.
1. Control frames in hdlc_cisco and hdlc_ppp
When these drivers send control frames, skb->protocol is not set.
This value should be set to htons(ETH_P_HDLC), because when receiving control frames, their skb->protocol is set to htons(ETH_P_HDLC).
When receiving, hdlc_type_trans in hdlc.h is called, which then calls cisco_type_trans or ppp_type_trans. The skb->protocol of control frames is set to htons(ETH_P_HDLC) so that the control frames can be received by hdlc_rcv in hdlc.c, which calls cisco_rx or ppp_rx to process the control frames.
2. hdlc_fr
When this driver sends control frames, skb->protocol is set to internal values used in this driver.
When this driver sends data frames (from upper stacked PVC devices), skb->protocol is the same as that of the user data packet being sent on the upper PVC device (for normal PVC devices), or is htons(ETH_P_802_3) (for Ethernet-emulating PVC devices).
However, skb->protocol for both control frames and data frames should be set to htons(ETH_P_HDLC), because when receiving, all frames received on the HDLC device will have their skb->protocol set to htons(ETH_P_HDLC).
When receiving, hdlc_type_trans in hdlc.h is called, and because this driver doesn't provide a type_trans function in struct hdlc_proto, all frames will have their skb->protocol set to htons(ETH_P_HDLC). The frames are then received by hdlc_rcv in hdlc.c, which calls fr_rx to process the frames (control frames are consumed and data frames are re-received on upper PVC devices).
--- drivers/net/wan/hdlc_cisco.c | 1 + drivers/net/wan/hdlc_fr.c | 3 +++ drivers/net/wan/hdlc_ppp.c | 1 + 3 files changed, 5 insertions(+)
drivers/net/wan/hdlc_cisco.c +1 -0
@@ -120,6 +120,7 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type,skb_put (skb,sizeof (struct cisco_packet )); skb->priority =TC_PRIO_CONTROL ; skb->dev = dev; + skb->protocol =htons (ETH_P_HDLC );skb_reset_network_header (skb);dev_queue_xmit (skb);
drivers/net/wan/hdlc_fr.c +3 -0
@@ -435,6 +435,8 @@ static netdev_tx_t pvc_xmit(struct sk_buff *skb, struct net_device *dev)if (pvc->state.fecn)/* TX Congestion counter */ dev->stats.tx_compressed++; skb->dev = pvc->frad; + skb->protocol =htons (ETH_P_HDLC ); +skb_reset_network_header (skb);dev_queue_xmit (skb);return NETDEV_TX_OK ; }
@@ -557,6 +559,7 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)skb_put (skb, i); skb->priority =TC_PRIO_CONTROL ; skb->dev = dev; + skb->protocol =htons (ETH_P_HDLC );skb_reset_network_header (skb);dev_queue_xmit (skb);
drivers/net/wan/hdlc_ppp.c +1 -0
@@ -254,6 +254,7 @@ static void ppp_tx_cp(struct net_device *dev, u16 pid, u8 code, skb->priority =TC_PRIO_CONTROL ; skb->dev = dev; + skb->protocol =htons (ETH_P_HDLC );skb_reset_network_header (skb);skb_queue_tail (&tx_queue, skb); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 9/70 drivers/net/wan/hdlc_fr: Add needed_headroom for PVC devices
In reply to Greg Kroah-HartmanFrom: Xie He <[email protected]>
[ Upstream commit 44a049c42681de71c783d75cd6e56b4e339488b0 ]
PVC devices are virtual devices in this driver stacked on top of the actual HDLC device. They are the devices normal users would use. PVC devices have two types: normal PVC devices and Ethernet-emulating PVC devices.
When transmitting data with PVC devices, the ndo_start_xmit function will prepend a header of 4 or 10 bytes. Currently this driver requests this headroom to be reserved for normal PVC devices by setting their hard_header_len to 10. However, this does not work when these devices are used with AF_PACKET/RAW sockets. Also, this driver does not request this headroom for Ethernet-emulating PVC devices (but deals with this problem by reallocating the skb when needed, which is not optimal).
This patch replaces hard_header_len with needed_headroom, and set needed_headroom for Ethernet-emulating PVC devices, too. This makes the driver to request headroom for all PVC devices in all cases.
--- drivers/net/wan/hdlc_fr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wan/hdlc_fr.c +2 -1
@@ -1045,7 +1045,7 @@ static void pvc_setup(struct net_device *dev) { dev->type =ARPHRD_DLCI ; dev->flags =IFF_POINTOPOINT ; - dev->hard_header_len =10 ; + dev->hard_header_len =0 ; dev->addr_len =2 ;netif_keep_dst (dev); }
@@ -1097,6 +1097,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type) dev->mtu =HDLC_MAX_MTU ; dev->min_mtu =68 ; dev->max_mtu =HDLC_MAX_MTU ; + dev->needed_headroom =10 ; dev->priv_flags |=IFF_NO_QUEUE ; dev->ml_priv = pvc;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 17/70 nvme-fc: fail new connections to a deleted host or remote port
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 9e0e8dac985d4bd07d9e62922b9d189d3ca2fccf ]
The lldd may have made calls to delete a remote port or local port and the delete is in progress when the cli then attempts to create a new controller. Currently, this proceeds without error although it can't be very successful.
Fix this by validating that both the host port and remote port are present when a new controller is to be created.
--- drivers/nvme/host/fc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/nvme/host/fc.c +4 -2
@@ -3012,12 +3012,14 @@ nvme_fc_create_ctrl(struct device *dev, struct nvmf_ctrl_options *opts)spin_lock_irqsave (&nvme_fc_lock, flags);list_for_each_entry (lport, &nvme_fc_lport_list, port_list) {if (lport->localport.node_name != laddr.nn || - lport->localport.port_name != laddr.pn) + lport->localport.port_name != laddr.pn || + lport->localport.port_state !=FC_OBJSTATE_ONLINE )continue ;list_for_each_entry (rport, &lport->endp_list, endp_list) {if (rport->remoteport.node_name != raddr.nn || - rport->remoteport.port_name != raddr.pn) + rport->remoteport.port_name != raddr.pn || + rport->remoteport.port_state !=FC_OBJSTATE_ONLINE )continue ;/* if fail to get reference fall through. Will error */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 35/70 fbcon: Fix global-out-of-bounds read in fbcon_get_font()
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
commit 5af08640795b2b9a940c9266c0260455377ae262 upstream.
fbcon_get_font() is reading out-of-bounds. A malicious user may resize vc->vc_font.height to a large value, causing fbcon_get_font() to read out of fontdata.
fbcon_get_font() handles both built-in and user-provided fonts. Fortunately, recently we have added FONT_EXTRA_WORDS support for built-in fonts, so fix it by adding range checks using FNTSIZE().
This patch depends on patch "fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h", and patch "Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts".
--- drivers/video/fbdev/core/fbcon.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/video/fbdev/core/fbcon.c +12 -0
@@ -2248,6 +2248,9 @@ static int fbcon_get_font(struct vc_dataif (font->width <=8 ) { j = vc->vc_font.height; +if (font->charcount * j >FNTSIZE (fontdata)) +return -EINVAL ; +for (i =0 ; i < font->charcount; i++) {memcpy (data, fontdata, j);memset (data + j,0 ,32 - j);
@@ -2256,6 +2259,9 @@ static int fbcon_get_font(struct vc_data } }else if (font->width <=16 ) { j = vc->vc_font.height *2 ; +if (font->charcount * j >FNTSIZE (fontdata)) +return -EINVAL ; +for (i =0 ; i < font->charcount; i++) {memcpy (data, fontdata, j);memset (data + j,0 ,64 - j);
@@ -2263,6 +2269,9 @@ static int fbcon_get_font(struct vc_data fontdata += j; } }else if (font->width <=24 ) { +if (font->charcount * (vc->vc_font.height *sizeof (u32)) >FNTSIZE (fontdata)) +return -EINVAL ; +for (i =0 ; i < font->charcount; i++) {for (j =0 ; j < vc->vc_font.height; j++) { *data++ = fontdata[0 ];
@@ -2275,6 +2284,9 @@ static int fbcon_get_font(struct vc_data } }else { j = vc->vc_font.height *4 ; +if (font->charcount * j >FNTSIZE (fontdata)) +return -EINVAL ; +for (i =0 ; i < font->charcount; i++) {memcpy (data, fontdata, j);memset (data + j,0 ,128 - j);
Greg Kroah-Hartman
maintainerPATCH 39/70 platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse
In reply to Greg Kroah-HartmanFrom: Aaron Ma <[email protected]>
commit 720ef73d1a239e33c3ad8fac356b9b1348e68aaf upstream.
Evaluating ACPI _BCL could fail, then ACPI buffer size will be set to 0. When reuse this ACPI buffer, AE_BUFFER_OVERFLOW will be triggered.
Re-initialize buffer size will make ACPI evaluate successfully.
--- drivers/platform/x86/thinkpad_acpi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/platform/x86/thinkpad_acpi.c +3 -1
@@ -6749,8 +6749,10 @@ static int __init tpacpi_query_bcl_levellist_for_each_entry (child, &device->children, node) {acpi_status status =acpi_evaluate_object (child->handle,"_BCL" ,NULL , &buffer); -if (ACPI_FAILURE (status)) +if (ACPI_FAILURE (status)) { + buffer.length =ACPI_ALLOCATE_BUFFER ;continue ; + } obj = (union acpi_object *)buffer.pointer;if (!obj || (obj->type !=ACPI_TYPE_PACKAGE )) {
Greg Kroah-Hartman
maintainerPATCH 44/70 ftrace: Move RCU is watching check after recursion check
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit b40341fad6cc2daa195f8090fd3348f18fff640a upstream.
The first thing that the ftrace function callback helper functions should do is to check for recursion. Peter Zijlstra found that when "rcu_is_watching()" had its notrace removed, it caused perf function tracing to crash. This is because the call of rcu_is_watching() is tested before function recursion is checked and and if it is traced, it will cause an infinite recursion loop.
rcu_is_watching() should still stay notrace, but to prevent this should never had crashed in the first place. The recursion prevention must be the first thing done in callback functions.
--- kernel/trace/ftrace.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
kernel/trace/ftrace.c +3 -5
@@ -6159,17 +6159,15 @@ static void ftrace_ops_assist_func(unsig {int bit; -if ((op->flags &FTRACE_OPS_FL_RCU ) && !rcu_is_watching ()) -return ; - bit =trace_test_and_set_recursion (TRACE_LIST_START ,TRACE_LIST_MAX );if (bit <0 )return ;preempt_disable_notrace (); -if (!(op->flags &FTRACE_OPS_FL_PER_CPU ) || - !ftrace_function_local_disabled (op)) { +if ((!(op->flags &FTRACE_OPS_FL_RCU ) ||rcu_is_watching ()) && + (!(op->flags &FTRACE_OPS_FL_PER_CPU ) || + !ftrace_function_local_disabled (op))) { op->func (ip, parent_ip, op, regs); }
Greg Kroah-Hartman
maintainerPATCH 36/70 net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key()
In reply to Greg Kroah-HartmanFrom: Anant Thazhemadam <[email protected]>
commit 3dc289f8f139997f4e9d3cfccf8738f20d23e47b upstream.
In nl80211_parse_key(), key.idx is first initialized as -1. If this value of key.idx remains unmodified and gets returned, and nl80211_key_allowed() also returns 0, then rdev_del_key() gets called with key.idx = -1.
This causes an out-of-bounds array access.
Handle this issue by checking if the value of key.idx after nl80211_parse_key() is called and return -EINVAL if key.idx < 0.
--- net/wireless/nl80211.c | 3 +++ 1 file changed, 3 insertions(+)
net/wireless/nl80211.c +3 -0
@@ -3343,6 +3343,9 @@ static int nl80211_del_key(struct sk_bufif (err)return err; +if (key.idx <0 ) +return -EINVAL ; +if (info->attrs[NL80211_ATTR_MAC ]) mac_addr =nla_data (info->attrs[NL80211_ATTR_MAC ]);
Greg Kroah-Hartman
maintainerPATCH 37/70 usermodehelper: reset umask to default before executing user process
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit 4013c1496c49615d90d36b9d513eee8e369778e9 upstream.
Kernel threads intentionally do CLONE_FS in order to follow any changes that 'init' does to set up the root directory (or cwd).
It is admittedly a bit odd, but it avoids the situation where 'init' does some extensive setup to initialize the system environment, and then we execute a usermode helper program, and it uses the original FS setup from boot time that may be very limited and incomplete.
[ Both Al Viro and Eric Biederman point out that 'pivot_root()' will
follow the root regardless, since it fixes up other users of root (see chroot_fs_refs() for details), but overmounting root and doing a chroot() would not. ]
However, Vegard Nossum noticed that the CLONE_FS not only means that we follow the root and current working directories, it also means we share umask with whatever init changed it to. That wasn't intentional.
Just reset umask to the original default (0022) before actually starting the usermode helper program.
--- kernel/umh.c | 9 +++++++++ 1 file changed, 9 insertions(+)
kernel/umh.c +9 -0
@@ -13,6 +13,7 @@#include <linux/cred.h> #include <linux/file.h> #include <linux/fdtable.h> +#include <linux/fs_struct.h> #include <linux/workqueue.h> #include <linux/security.h> #include <linux/mount.h>
@@ -71,6 +72,14 @@ static int call_usermodehelper_exec_asynspin_unlock_irq (¤t->sighand->siglock);/* +* Initial kernel threads share ther FS with init, in order to +* get the init root directory. But we've now created a new +* thread that is going to execve a user process and has its own +* 'struct fs_struct'. Reset umask to the default. +*/ + current->fs->umask =0022 ; + +/* * Our parent (unbound workqueue) runs with elevated scheduling * priority. Avoid propagating that into the userspace child. */
Greg Kroah-Hartman
maintainerPATCH 20/70 clk: samsung: exynos4: mark chipid clock as CLK_IGNORE_UNUSED
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit f3bb0f796f5ffe32f0fbdce5b1b12eb85511158f ]
The ChipID IO region has it's own clock, which is being disabled while scanning for unused clocks. It turned out that some CPU hotplug, CPU idle or even SOC firmware code depends on the reads from that area. Fix the mysterious hang caused by entering deep CPU idle state by ignoring the 'chipid' clock during unused clocks scan, as there are no direct clients for it which will keep it enabled.
--- drivers/clk/samsung/clk-exynos4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/samsung/clk-exynos4.c +2 -2
@@ -1075,7 +1075,7 @@ static const struct samsung_gate_clock exynos4210_gate_clks[] __initconst = {GATE (CLK_PCIE ,"pcie" ,"aclk133" ,GATE_IP_FSYS ,14 ,0 ,0 ),GATE (CLK_SMMU_PCIE ,"smmu_pcie" ,"aclk133" ,GATE_IP_FSYS ,18 ,0 ,0 ),GATE (CLK_MODEMIF ,"modemif" ,"aclk100" ,GATE_IP_PERIL ,28 ,0 ,0 ), -GATE (CLK_CHIPID ,"chipid" ,"aclk100" ,E4210_GATE_IP_PERIR ,0 ,0 ,0 ), +GATE (CLK_CHIPID ,"chipid" ,"aclk100" ,E4210_GATE_IP_PERIR ,0 ,CLK_IGNORE_UNUSED ,0 ),GATE (CLK_SYSREG ,"sysreg" ,"aclk100" ,E4210_GATE_IP_PERIR ,0 ,CLK_IGNORE_UNUSED ,0 ), GATE(CLK_HDMI_CEC, "hdmi_cec", "aclk100", E4210_GATE_IP_PERIR, 11, 0,
@@ -1116,7 +1116,7 @@ static const struct samsung_gate_clock exynos4x12_gate_clks[] __initconst = { 0),GATE (CLK_TSADC ,"tsadc" ,"aclk133" ,E4X12_GATE_BUS_FSYS1 ,16 ,0 ,0 ),GATE (CLK_MIPI_HSI ,"mipi_hsi" ,"aclk133" ,GATE_IP_FSYS ,10 ,0 ,0 ), -GATE (CLK_CHIPID ,"chipid" ,"aclk100" ,E4X12_GATE_IP_PERIR ,0 ,0 ,0 ), +GATE (CLK_CHIPID ,"chipid" ,"aclk100" ,E4X12_GATE_IP_PERIR ,0 ,CLK_IGNORE_UNUSED ,0 ),GATE (CLK_SYSREG ,"sysreg" ,"aclk100" ,E4X12_GATE_IP_PERIR ,1 ,CLK_IGNORE_UNUSED ,0 ), GATE(CLK_HDMI_CEC, "hdmi_cec", "aclk100", E4X12_GATE_IP_PERIR, 11, 0,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 22/70 i2c: cpm: Fix i2c_ram structure
In reply to Greg Kroah-HartmanFrom: Nicolas VINCENT <[email protected]>
[ Upstream commit a2bd970aa62f2f7f80fd0d212b1d4ccea5df4aed ]
the i2c_ram structure is missing the sdmatmp field mentionned in datasheet for MPC8272 at paragraph 36.5. With this field missing, the hardware would write past the allocated memory done through cpm_muram_alloc for the i2c_ram structure and land in memory allocated for the buffers descriptors corrupting the cbd_bufaddr field. Since this field is only set during setup(), the first i2c transaction would work and the following would send data read from an arbitrary memory location.
--- drivers/i2c/busses/i2c-cpm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/i2c/busses/i2c-cpm.c +3 -0
@@ -74,6 +74,9 @@ struct i2c_ram {char res1[4 ];/* Reserved */ ushort rpbase;/* Relocation pointer */ char res2[2 ];/* Reserved */ +/* The following elements are only for CPM2 */ +char res3[4 ];/* Reserved */ +uint sdmatmp;/* Internal */ };#define I2COM_START 0x80
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 23/70 Input: trackpoint - enable Synaptics trackpoints
In reply to Greg Kroah-HartmanFrom: Vincent Huang <[email protected]>
[ Upstream commit 996d585b079ad494a30cac10e08585bcd5345125 ]
Add Synaptics IDs in trackpoint_start_protocol() to mark them as valid.
--- drivers/input/mouse/trackpoint.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/mouse/trackpoint.c +2 -0
@@ -297,6 +297,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse,case TP_VARIANT_ALPS :case TP_VARIANT_ELAN :case TP_VARIANT_NXP : +case TP_VARIANT_JYT_SYNAPTICS : +case TP_VARIANT_SYNAPTICS :if (variant_id) *variant_id = param[0 ];if (firmware_id)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 24/70 random32: Restore __latent_entropy attribute on net_rand_state
In reply to Greg Kroah-HartmanFrom: Thibaut Sautereau <[email protected]>
[ Upstream commit 09a6b0bc3be793ca8cba580b7992d73e9f68f15d ]
Commit f227e3ec3b5c ("random32: update the net random state on interrupt and activity") broke compilation and was temporarily fixed by Linus in 83bdc7275e62 ("random32: remove net_rand_state from the latent entropy gcc plugin") by entirely moving net_rand_state out of the things handled by the latent_entropy GCC plugin.
Quoted 1 line
From what I understand when reading the plugin code, using the
__latent_entropy attribute on a declaration was the wrong part and simply keeping the __latent_entropy attribute on the variable definition was the correct fix.
--- lib/random32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/random32.c +1 -1
@@ -48,7 +48,7 @@ static inline void prandom_state_selftest(void) }#endif -DEFINE_PER_CPU(struct rnd_state, net_rand_state); +DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;/** * prandom_u32_state - seeded pseudo-random number generator.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 21/70 iommu/exynos: add missing put_device() call in exynos_iommu_of_xlate()
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit 1a26044954a6d1f4d375d5e62392446af663be7a ]
if of_find_device_by_node() succeed, exynos_iommu_of_xlate() doesn't have a corresponding put_device(). Thus add put_device() to fix the exception handling for this function implementation.
--- drivers/iommu/exynos-iommu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/iommu/exynos-iommu.c +6 -2
@@ -1296,13 +1296,17 @@ static int exynos_iommu_of_xlate(struct device *dev,return -ENODEV ; data =platform_get_drvdata (sysmmu); -if (!data) +if (!data) { +put_device (&sysmmu->dev);return -ENODEV ; + }if (!owner) { owner =kzalloc (sizeof (*owner),GFP_KERNEL ); -if (!owner) +if (!owner) { +put_device (&sysmmu->dev);return -ENOMEM ; + }INIT_LIST_HEAD (&owner->controllers);mutex_init (&owner->rpm_lock);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 15/70 mac80211: do not allow bigger VHT MPDUs than the hardware supports
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit 3bd5c7a28a7c3aba07a2d300d43f8e988809e147 ]
Limit maximum VHT MPDU size by local capability.
--- net/mac80211/vht.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/mac80211/vht.c +4 -4
@@ -170,10 +170,7 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,/* take some capabilities as-is */ cap_info =le32_to_cpu (vht_cap_ie->vht_cap_info); vht_cap->cap = cap_info; - vht_cap->cap &=IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 | -IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 | -IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 | -IEEE80211_VHT_CAP_RXLDPC | + vht_cap->cap &=IEEE80211_VHT_CAP_RXLDPC |IEEE80211_VHT_CAP_VHT_TXOP_PS |IEEE80211_VHT_CAP_HTC_VHT | IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |
@@ -182,6 +179,9 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN ; + vht_cap->cap |=min_t (u32, cap_info &IEEE80211_VHT_CAP_MAX_MPDU_MASK , + own_cap.cap &IEEE80211_VHT_CAP_MAX_MPDU_MASK ); +/* and some based on our own capabilities */ switch (own_cap.cap &IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK ) {case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ :
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 19/70 nfs: Fix security label length not being reset
In reply to Greg Kroah-HartmanFrom: Jeffrey Mitchell <[email protected]>
[ Upstream commit d33030e2ee3508d65db5644551435310df86010e ]
nfs_readdir_page_filler() iterates over entries in a directory, reusing the same security label buffer, but does not reset the buffer's length. This causes decode_attr_security_label() to return -ERANGE if an entry's security label is longer than the previous one's. This error, in nfs4_decode_dirent(), only gets passed up as -EAGAIN, which causes another failed attempt to copy into the buffer. The second error is ignored and the remaining entries do not show up in ls, specifically the getdents64() syscall.
Reproduce by creating multiple files in NFS and giving one of the later files a longer security label. ls will not see that file nor any that are added afterwards, though they will exist on the backend.
In nfs_readdir_page_filler(), reset security label buffer length before every reuse
--- fs/nfs/dir.c | 3 +++ 1 file changed, 3 insertions(+)
fs/nfs/dir.c +3 -0
@@ -560,6 +560,9 @@ int nfs_readdir_page_filler(nfs_readdir_descriptor_t *desc, struct nfs_entry *enxdr_set_scratch_buffer (&stream,page_address (scratch),PAGE_SIZE ); do { + if (entry->label) + entry->label->len = NFS4_MAXLABELLEN; + status = xdr_decode(desc, entry, &stream); if (status != 0) { if (status == -EAGAIN)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 40/70 driver core: Fix probe_count imbalance in really_probe()
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit b292b50b0efcc7095d8bf15505fba6909bb35dce upstream.
syzbot is reporting hung task in wait_for_device_probe() [1]. At least, we always need to decrement probe_count if we incremented probe_count in really_probe().
However, since I can't find "Resources present before probing" message in the console log, both "this message simply flowed off" and "syzbot is not hitting this path" will be possible. Therefore, while we are at it, let's also prepare for concurrent wait_for_device_probe() calls by replacing wake_up() with wake_up_all().
[1] https://syzkaller.appspot.com/bug?id=25c833f1983c9c1d512f4ff860dd0d7f5a2e2c0f
--- drivers/base/dd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/base/dd.c +3 -2
@@ -377,7 +377,8 @@ static int really_probe(struct device *d drv->bus->name, __func__, drv->name, dev_name(dev));if (!list_empty (&dev->devres_head)) {dev_crit (dev,"Resources present before probing\n" ); -return -EBUSY ; + ret = -EBUSY ; + goto done; } re_probe:
@@ -486,7 +487,7 @@ pinctrl_bind_failed: ret =0 ; done:atomic_dec (&probe_count); -wake_up (&probe_waitqueue); +wake_up_all (&probe_waitqueue);return ret; }
Greg Kroah-Hartman
maintainerPATCH 45/70 macsec: avoid use-after-free in macsec_handle_frame()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit c7cc9200e9b4a2ac172e990ef1975cd42975dad6 upstream.
De-referencing skb after call to gro_cells_receive() is not allowed. We need to fetch skb->len earlier.
--- drivers/net/macsec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/macsec.c +3 -1
@@ -1081,6 +1081,7 @@ static rx_handler_result_t macsec_handlestruct macsec_rx_sa *rx_sa;struct macsec_rxh_data *rxd;struct macsec_dev *macsec; +unsigned int len;sci_t sci;u32 pn;bool cbit;
@@ -1236,9 +1237,10 @@ deliver:macsec_rxsc_put (rx_sc);skb_orphan (skb); + len = skb->len; ret =gro_cells_receive (&macsec->gro_cells, skb);if (ret ==NET_RX_SUCCESS ) -count_rx (dev, skb->len); +count_rx (dev, len);else macsec->secy.netdev->stats.rx_dropped++;
Greg Kroah-Hartman
maintainerPATCH 47/70 cifs: Fix incomplete memory allocation on setxattr path
In reply to Greg Kroah-HartmanFrom: Vladimir Zapolskiy <[email protected]>
commit 64b7f674c292207624b3d788eda2dde3dc1415df upstream.
On setxattr() syscall path due to an apprent typo the size of a dynamically allocated memory chunk for storing struct smb2_file_full_ea_info object is computed incorrectly, to be more precise the first addend is the size of a pointer instead of the wanted object size. Coincidentally it makes no difference on 64-bit platforms, however on 32-bit targets the following memcpy() writes 4 bytes of data outside of the dynamically allocated memory.
=============================================================================
BUG kmalloc-16 (Not tainted): Redzone overwritten
-----------------------------------------------------------------------------
Disabling lock debugging due to kernel taint
INFO: 0x79e69a6f-0x9e5cdecf @offset=368. First byte 0x73 instead of 0xcc
INFO: Slab 0xd36d2454 objects=85 used=51 fp=0xf7d0fc7a flags=0x35000201
INFO: Object 0x6f171df3 @offset=352 fp=0x00000000
Redzone 5d4ff02d: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc ................ Object 6f171df3: 00 00 00 00 00 05 06 00 73 6e 72 75 62 00 66 69 ........snrub.fi
Redzone 79e69a6f: 73 68 32 0a sh2.
Padding 56254d82: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ
CPU: 0 PID: 8196 Comm: attr Tainted: G B 5.9.0-rc8+ #3 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1 04/01/2014 Call Trace: dump_stack+0x54/0x6e print_trailer+0x12c/0x134 check_bytes_and_report.cold+0x3e/0x69 check_object+0x18c/0x250 free_debug_processing+0xfe/0x230 __slab_free+0x1c0/0x300 kfree+0x1d3/0x220 smb2_set_ea+0x27d/0x540 cifs_xattr_set+0x57f/0x620 __vfs_setxattr+0x4e/0x60 __vfs_setxattr_noperm+0x4e/0x100 __vfs_setxattr_locked+0xae/0xd0 vfs_setxattr+0x4e/0xe0 setxattr+0x12c/0x1a0 path_setxattr+0xa4/0xc0 __ia32_sys_lsetxattr+0x1d/0x20 __do_fast_syscall_32+0x40/0x70 do_fast_syscall_32+0x29/0x60 do_SYSENTER_32+0x15/0x20 entry_SYSENTER_32+0x9f/0xf2
--- fs/cifs/smb2ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/smb2ops.c +1 -1
@@ -652,7 +652,7 @@ smb2_set_ea(const unsigned int xid, strureturn rc; } - len =sizeof (ea) + ea_name_len + ea_value_len +1 ; + len =sizeof (*ea) + ea_name_len + ea_value_len +1 ; ea =kzalloc (len,GFP_KERNEL );if (ea ==NULL ) {SMB2_close (xid, tcon, fid.persistent_fid, fid.volatile_fid);
Greg Kroah-Hartman
maintainerPATCH 46/70 mm/khugepaged: fix filemap page_to_pgoff(page) != offset
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
commit 033b5d77551167f8c24ca862ce83d3e0745f9245 upstream.
There have been elusive reports of filemap_fault() hitting its VM_BUG_ON_PAGE(page_to_pgoff(page) != offset, page) on kernels built with CONFIG_READ_ONLY_THP_FOR_FS=y.
Suren has hit it on a kernel with CONFIG_READ_ONLY_THP_FOR_FS=y and CONFIG_NUMA is not set: and he has analyzed it down to how khugepaged without NUMA reuses the same huge page after collapse_file() failed (whereas NUMA targets its allocation to the respective node each time). And most of us were usually testing with CONFIG_NUMA=y kernels.
collapse_file(old start)
new_page = khugepaged_alloc_page(hpage) __SetPageLocked(new_page)
new_page->index = start // hpage->index=old offset new_page->mapping = mapping xas_store(&xas, new_page)
filemap_fault
page = find_get_page(mapping, offset)
// if offset falls inside hpage then
// compound_head(page) == hpage
lock_page_maybe_drop_mmap()
__lock_page(page) // collapse fails
xas_store(&xas, old page)
new_page->mapping = NULL
unlock_page(new_page)
collapse_file(new start)
new_page = khugepaged_alloc_page(hpage) __SetPageLocked(new_page)
new_page->index = start // hpage->index=new offset new_page->mapping = mapping // mapping becomes valid again
// since compound_head(page) == hpage
// page_to_pgoff(page) got changed
VM_BUG_ON_PAGE(page_to_pgoff(page) != offset)An initial patch replaced __SetPageLocked() by lock_page(), which did fix the race which Suren illustrates above. But testing showed that it's not good enough: if the racing task's __lock_page() gets delayed long after its find_get_page(), then it may follow collapse_file(new start)'s successful final unlock_page(), and crash on the same VM_BUG_ON_PAGE.
It could be fixed by relaxing filemap_fault()'s VM_BUG_ON_PAGE to a check and retry (as is done for mapping), with similar relaxations in find_lock_entry() and pagecache_get_page(): but it's not obvious what else might get caught out; and khugepaged non-NUMA appears to be unique in exposing a page to page cache, then revoking, without going through a full cycle of freeing before reuse.
Instead, non-NUMA khugepaged_prealloc_page() release the old page if anyone else has a reference to it (1% of cases when I tested).
Although never reported on huge tmpfs, I believe its find_lock_entry() has been at similar risk; but huge tmpfs does not rely on khugepaged for its normal working nearly so much as READ_ONLY_THP_FOR_FS does.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=206569
--- mm/khugepaged.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
mm/khugepaged.c +12 -0
@@ -801,6 +801,18 @@ static struct page *khugepaged_alloc_hugstatic bool khugepaged_prealloc_page (struct page **hpage,bool *wait) { +/* +* If the hpage allocated earlier was briefly exposed in page cache +* before collapse_file() failed, it is possible that racing lookups +* have not yet completed, and would then be unpleasantly surprised by +* finding the hpage reused for the same mapping at a different offset. +* Just release the previous allocation if there is any danger of that. +*/ +if (*hpage &&page_count (*hpage) >1 ) { +put_page (*hpage); + *hpage =NULL ; + } +if (!*hpage) *hpage =khugepaged_alloc_hugepage (wait);
Greg Kroah-Hartman
maintainerPATCH 18/70 pinctrl: mvebu: Fix i2c sda definition for 98DX3236
In reply to Greg Kroah-HartmanFrom: Chris Packham <[email protected]>
[ Upstream commit 63c3212e7a37d68c89a13bdaebce869f4e064e67 ]
Per the datasheet the i2c functions use MPP_Sel=0x1. They are documented as using MPP_Sel=0x4 as well but mixing 0x1 and 0x4 is clearly wrong. On the board tested 0x4 resulted in a non-functioning i2c bus so stick with 0x1 which works.
--- drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/mvebu/pinctrl-armada-xp.c +1 -1
@@ -418,7 +418,7 @@ static struct mvebu_mpp_mode mv98dx3236_mpp_modes[] = { MPP_VAR_FUNCTION(0x1, "i2c0", "sck", V_98DX3236_PLUS)),MPP_MODE (15 ,MPP_VAR_FUNCTION (0x0 ,"gpio" ,NULL ,V_98DX3236_PLUS ), -MPP_VAR_FUNCTION (0x4 ,"i2c0" ,"sda" ,V_98DX3236_PLUS )), +MPP_VAR_FUNCTION (0x1 ,"i2c0" ,"sda" ,V_98DX3236_PLUS )),MPP_MODE (16 ,MPP_VAR_FUNCTION (0x0 ,"gpo" ,NULL ,V_98DX3236_PLUS ), MPP_VAR_FUNCTION(0x4, "dev", "oe", V_98DX3236_PLUS)),
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 43/70 Btrfs: fix unexpected failure of nocow buffered writes after snapshotting when low on space
In reply to Greg Kroah-HartmanFrom: Robbie Ko <[email protected]>
commit 8ecebf4d767e2307a946c8905278d6358eda35c3 upstream.
Commit e9894fd3e3b3 ("Btrfs: fix snapshot vs nocow writting") forced nocow writes to fallback to COW, during writeback, when a snapshot is created. This resulted in writes made before creating the snapshot to unexpectedly fail with ENOSPC during writeback when success (0) was returned to user space through the write system call.
The steps leading to this problem are:
1. When it's not possible to allocate data space for a write, the buffered write path checks if a NOCOW write is possible. If it is, it will not reserve space and success (0) is returned to user space.
2. Then when a snapshot is created, the root's will_be_snapshotted atomic is incremented and writeback is triggered for all inode's that belong to the root being snapshotted. Incrementing that atomic forces all previous writes to fallback to COW during writeback (running delalloc).
3. This results in the writeback for the inodes to fail and therefore setting the ENOSPC error in their mappings, so that a subsequent fsync on them will report the error to user space. So it's not a completely silent data loss (since fsync will report ENOSPC) but it's a very unexpected and undesirable behaviour, because if a clean shutdown/unmount of the filesystem happens without previous calls to fsync, it is expected to have the data present in the files after mounting the filesystem again.
So fix this by adding a new atomic named snapshot_force_cow to the root structure which prevents this behaviour and works the following way:
1. It is incremented when we start to create a snapshot after triggering writeback and before waiting for writeback to finish.
2. This new atomic is now what is used by writeback (running delalloc) to decide whether we need to fallback to COW or not. Because we incremented this new atomic after triggering writeback in the snapshot creation ioctl, we ensure that all buffered writes that happened before snapshot creation will succeed and not fallback to COW (which would make them fail with ENOSPC).
3. The existing atomic, will_be_snapshotted, is kept because it is used to force new buffered writes, that start after we started snapshotting, to reserve data space even when NOCOW is possible. This makes these writes fail early with ENOSPC when there's no available space to allocate, preventing the unexpected behaviour of writeback later failing with ENOSPC due to a fallback to COW mode.
--- fs/btrfs/ctree.h | 1 + fs/btrfs/disk-io.c | 1 + fs/btrfs/inode.c | 25 ++++--------------------- fs/btrfs/ioctl.c | 16 ++++++++++++++++ 4 files changed, 22 insertions(+), 21 deletions(-)
fs/btrfs/ctree.h +1 -0
@@ -1257,6 +1257,7 @@ struct btrfs_root {int send_in_progress;struct btrfs_subvolume_writers *subv_writers;atomic_t will_be_snapshotted; +atomic_t snapshot_force_cow;/* For qgroup metadata space reserve */ atomic64_t qgroup_meta_rsv;
fs/btrfs/disk-io.c +1 -0
@@ -1200,6 +1200,7 @@ static void __setup_root(struct btrfs_rorefcount_set (&root->refs,1 );atomic_set (&root->will_be_snapshotted,0 );atomic64_set (&root->qgroup_meta_rsv,0 ); +atomic_set (&root->snapshot_force_cow,0 ); root->log_transid =0 ; root->log_transid_committed =-1 ; root->last_log_commit =0 ;
fs/btrfs/inode.c +4 -21
@@ -1335,7 +1335,7 @@ static noinline int run_delalloc_nocow(su64 disk_num_bytes;u64 ram_bytes;int extent_type; -int ret, err; +int ret;int type;int nocow;int check_prev =1 ;
@@ -1460,11 +1460,8 @@ next_slot:* if there are pending snapshots for this root, * we fall into common COW way. */ -if (!nolock) { - err =btrfs_start_write_no_snapshotting (root); -if (!err) - goto out_check; - } +if (!nolock &&atomic_read (&root->snapshot_force_cow)) + goto out_check;/* * force cow if csum exists in the range. * this ensure that csum for a given extent are
@@ -1473,9 +1470,6 @@ next_slot: ret =csum_exist_in_range (fs_info, disk_bytenr, num_bytes);if (ret) { -if (!nolock) -btrfs_end_write_no_snapshotting (root); -/* * ret could be -EIO if the above fails to read * metadata.
@@ -1488,11 +1482,8 @@ next_slot:WARN_ON_ONCE (nolock); goto out_check; } -if (!btrfs_inc_nocow_writers (fs_info, disk_bytenr)) { -if (!nolock) -btrfs_end_write_no_snapshotting (root); +if (!btrfs_inc_nocow_writers (fs_info, disk_bytenr)) goto out_check; - } nocow =1 ; }else if (extent_type ==BTRFS_FILE_EXTENT_INLINE ) { extent_end = found_key.offset +
@@ -1505,8 +1496,6 @@ next_slot: out_check:if (extent_end <= start) { path->slots[0 ]++; -if (!nolock && nocow) -btrfs_end_write_no_snapshotting (root);if (nocow)btrfs_dec_nocow_writers (fs_info, disk_bytenr); goto next_slot;
@@ -1528,8 +1517,6 @@ out_check: end, page_started, nr_written,1 , NULL);if (ret) { -if (!nolock && nocow) -btrfs_end_write_no_snapshotting (root);if (nocow)btrfs_dec_nocow_writers (fs_info, disk_bytenr);
@@ -1549,8 +1536,6 @@ out_check: ram_bytes,BTRFS_COMPRESS_NONE , BTRFS_ORDERED_PREALLOC);if (IS_ERR (em)) { -if (!nolock && nocow) -btrfs_end_write_no_snapshotting (root);if (nocow)btrfs_dec_nocow_writers (fs_info, disk_bytenr);
@@ -1589,8 +1574,6 @@ out_check:EXTENT_CLEAR_DATA_RESV , PAGE_UNLOCK | PAGE_SET_PRIVATE2); -if (!nolock && nocow) -btrfs_end_write_no_snapshotting (root); cur_offset = extent_end;/*
fs/btrfs/ioctl.c +16 -0
@@ -655,6 +655,7 @@ static int create_snapshot(struct btrfs_struct btrfs_pending_snapshot *pending_snapshot;struct btrfs_trans_handle *trans;int ret; +bool snapshot_force_cow = false;if (!test_bit (BTRFS_ROOT_REF_COWS , &root->state))return -EINVAL ;
@@ -671,6 +672,11 @@ static int create_snapshot(struct btrfs_ goto free_pending; } +/* +* Force new buffered writes to reserve space even when NOCOW is +* possible. This is to avoid later writeback (running dealloc) to +* fallback to COW mode and unexpectedly fail with ENOSPC. +*/ atomic_inc (&root->will_be_snapshotted);smp_mb__after_atomic ();btrfs_wait_for_no_snapshotting_writes (root);
@@ -679,6 +685,14 @@ static int create_snapshot(struct btrfs_if (ret) goto dec_and_free; +/* +* All previous writes have started writeback in NOCOW mode, so now +* we force future writes to fallback to COW mode during snapshot +* creation. +*/ +atomic_inc (&root->snapshot_force_cow); + snapshot_force_cow = true; +btrfs_wait_ordered_extents (root,U64_MAX ,0 , (u64)-1 ); btrfs_init_block_rsv(&pending_snapshot->block_rsv,
@@ -744,6 +758,8 @@ static int create_snapshot(struct btrfs_ fail:btrfs_subvolume_release_metadata (fs_info, &pending_snapshot->block_rsv); dec_and_free: +if (snapshot_force_cow) +atomic_dec (&root->snapshot_force_cow);if (atomic_dec_and_test (&root->will_be_snapshotted))wake_up_atomic_t (&root->will_be_snapshotted); free_pending:
Greg Kroah-Hartman
maintainerPATCH 57/70 net: stmmac: removed enabling eee in EEE set callback
In reply to Greg Kroah-HartmanFrom: Voon Weifeng <[email protected]>
[ Upstream commit 7241c5a697479c7d0c5a96595822cdab750d41ae ]
EEE should be only be enabled during stmmac_mac_link_up() when the link are up and being set up properly. set_eee should only do settings configuration and disabling the eee.
Without this fix, turning on EEE using ethtool will return "Operation not supported". This is due to the driver is in a dead loop waiting for eee to be advertised in the for eee to be activated but the driver will only configure the EEE advertisement after the eee is activated.
Ethtool should only return "Operation not supported" if there is no EEE capbility in the MAC controller.
--- .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +4 -11
@@ -677,23 +677,16 @@ static int stmmac_ethtool_op_set_eee(struct net_device *dev,struct stmmac_priv *priv =netdev_priv (dev);int ret; -if (!edata->eee_enabled) { +if (!priv->dma_cap.eee) +return -EOPNOTSUPP ; + +if (!edata->eee_enabled)stmmac_disable_eee_mode (priv); - }else { -/* We are asking for enabling the EEE but it is safe -* to verify all by invoking the eee_init function. -* In case of failure it will return an error. -*/ - edata->eee_enabled =stmmac_eee_init (priv); -if (!edata->eee_enabled) -return -EOPNOTSUPP ; - } ret =phy_ethtool_set_eee (dev->phydev, edata);if (ret)return ret; - priv->eee_enabled = edata->eee_enabled; priv->tx_lpi_timer = edata->tx_lpi_timer;return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 56/70 xfrm: clone whole liftime_cur structure in xfrm_do_migrate
In reply to Greg Kroah-HartmanFrom: Antony Antony <[email protected]>
[ Upstream commit 8366685b2883e523f91e9816d7be371eb1144749 ]
When we clone state only add_time was cloned. It missed values like bytes, packets. Now clone the all members of the structure.
v1->v3:
- use memcpy to copy the entire structure
--- net/xfrm/xfrm_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_state.c +1 -1
@@ -1427,7 +1427,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, x->tfcpad = orig->tfcpad; x->replay_maxdiff = orig->replay_maxdiff; x->replay_maxage = orig->replay_maxage; - x->curlft.add_time = orig->curlft.add_time; +memcpy (&x->curlft, &orig->curlft,sizeof (x->curlft)); x->km.state = orig->km.state; x->km.seq = orig->km.seq; x->replay = orig->replay;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 54/70 xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate
In reply to Greg Kroah-HartmanFrom: Antony Antony <[email protected]>
[ Upstream commit 91a46c6d1b4fcbfa4773df9421b8ad3e58088101 ]
XFRMA_REPLAY_ESN_VAL was not cloned completely from the old to the new. Migrate this attribute during XFRMA_MSG_MIGRATE
v1->v2:
- move curleft cloning to a separate patch
--- include/net/xfrm.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
include/net/xfrm.h +6 -10
@@ -1808,21 +1808,17 @@ static inline int xfrm_replay_state_esn_len(struct xfrm_replay_state_esn *replaystatic inline int xfrm_replay_clone (struct xfrm_state *x,struct xfrm_state *orig) { - x->replay_esn =kzalloc (xfrm_replay_state_esn_len (orig->replay_esn), + + x->replay_esn =kmemdup (orig->replay_esn, +xfrm_replay_state_esn_len (orig->replay_esn),GFP_KERNEL );if (!x->replay_esn)return -ENOMEM ; - - x->replay_esn->bmp_len = orig->replay_esn->bmp_len; - x->replay_esn->replay_window = orig->replay_esn->replay_window; - - x->preplay_esn =kmemdup (x->replay_esn, -xfrm_replay_state_esn_len (x->replay_esn), + x->preplay_esn =kmemdup (orig->preplay_esn, +xfrm_replay_state_esn_len (orig->preplay_esn),GFP_KERNEL ); -if (!x->preplay_esn) { -kfree (x->replay_esn); +if (!x->preplay_esn)return -ENOMEM ; - }return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 53/70 drm/amdgpu: prevent double kfree ttm->sg
In reply to Greg Kroah-HartmanFrom: Philip Yang <[email protected]>
[ Upstream commit 1d0e16ac1a9e800598dcfa5b6bc53b704a103390 ]
Set ttm->sg to NULL after kfree, to avoid memory corruption backtrace:
[ 420.932812] kernel BUG at /build/linux-do9eLF/linux-4.15.0/mm/slub.c:295! [ 420.934182] invalid opcode: 0000 [#1] SMP NOPTI [ 420.935445] Modules linked in: xt_conntrack ipt_MASQUERADE [ 420.951332] Hardware name: Dell Inc. PowerEdge R7525/0PYVT1, BIOS 1.5.4 07/09/2020 [ 420.952887] RIP: 0010:__slab_free+0x180/0x2d0 [ 420.954419] RSP: 0018:ffffbe426291fa60 EFLAGS: 00010246 [ 420.955963] RAX: ffff9e29263e9c30 RBX: ffff9e29263e9c30 RCX: 000000018100004b [ 420.957512] RDX: ffff9e29263e9c30 RSI: fffff3d33e98fa40 RDI: ffff9e297e407a80 [ 420.959055] RBP: ffffbe426291fb00 R08: 0000000000000001 R09: ffffffffc0d39ade [ 420.960587] R10: ffffbe426291fb20 R11: ffff9e49ffdd4000 R12: ffff9e297e407a80 [ 420.962105] R13: fffff3d33e98fa40 R14: ffff9e29263e9c30 R15: ffff9e2954464fd8 [ 420.963611] FS: 00007fa2ea097780(0000) GS:ffff9e297e840000(0000) knlGS:0000000000000000 [ 420.965144] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 420.966663] CR2: 00007f16bfffefb8 CR3: 0000001ff0c62000 CR4: 0000000000340ee0 [ 420.968193] Call Trace: [ 420.969703] ? __page_cache_release+0x3c/0x220 [ 420.971294] ? amdgpu_ttm_tt_unpopulate+0x5e/0x80 [amdgpu] [ 420.972789] kfree+0x168/0x180 [ 420.974353] ? amdgpu_ttm_tt_set_user_pages+0x64/0xc0 [amdgpu] [ 420.975850] ? kfree+0x168/0x180 [ 420.977403] amdgpu_ttm_tt_unpopulate+0x5e/0x80 [amdgpu] [ 420.978888] ttm_tt_unpopulate.part.10+0x53/0x60 [amdttm] [ 420.980357] ttm_tt_destroy.part.11+0x4f/0x60 [amdttm] [ 420.981814] ttm_tt_destroy+0x13/0x20 [amdttm] [ 420.983273] ttm_bo_cleanup_memtype_use+0x36/0x80 [amdttm] [ 420.984725] ttm_bo_release+0x1c9/0x360 [amdttm] [ 420.986167] amdttm_bo_put+0x24/0x30 [amdttm] [ 420.987663] amdgpu_bo_unref+0x1e/0x30 [amdgpu] [ 420.989165] amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu+0x9ca/0xb10 [amdgpu] [ 420.990666] kfd_ioctl_alloc_memory_of_gpu+0xef/0x2c0 [amdgpu]
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -0
@@ -727,6 +727,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_tt *ttm) release_sg:kfree (ttm->sg); + ttm->sg =NULL ;return r; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 52/70 openvswitch: handle DNAT tuple collision
In reply to Greg Kroah-HartmanFrom: Dumitru Ceara <[email protected]>
commit 8aa7b526dc0b5dbf40c1b834d76a667ad672a410 upstream.
With multiple DNAT rules it's possible that after destination translation the resulting tuples collide.
For example, two openvswitch flows:
nw_dst=10.0.0.10,tp_dst=10, actions=ct(commit,table=2,nat(dst=20.0.0.1:20)) nw_dst=10.0.0.20,tp_dst=10, actions=ct(commit,table=2,nat(dst=20.0.0.1:20))
Assuming two TCP clients initiating the following connections:
10.0.0.10:5000->10.0.0.10:10 10.0.0.10:5000->10.0.0.20:10
Both tuples would translate to 10.0.0.10:5000->20.0.0.1:20 causing nf_conntrack_confirm() to fail because of tuple collision.
Netfilter handles this case by allocating a null binding for SNAT at egress by default. Perform the same operation in openvswitch for DNAT if no explicit SNAT is requested by the user and allocate a null binding for SNAT for packets in the "original" direction.
Reported-at: https://bugzilla.redhat.com/1877128
--- net/openvswitch/conntrack.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
net/openvswitch/conntrack.c +12 -8
@@ -881,15 +881,19 @@ static int ovs_ct_nat(struct net *net, s } err =ovs_ct_nat_execute (skb, ct, ctinfo, &info->range, maniptype); -if (err ==NF_ACCEPT && - ct->status &IPS_SRC_NAT && ct->status &IPS_DST_NAT ) { -if (maniptype ==NF_NAT_MANIP_SRC ) - maniptype =NF_NAT_MANIP_DST ; -else - maniptype =NF_NAT_MANIP_SRC ; +if (err ==NF_ACCEPT && ct->status &IPS_DST_NAT ) { +if (ct->status &IPS_SRC_NAT ) { +if (maniptype ==NF_NAT_MANIP_SRC ) + maniptype =NF_NAT_MANIP_DST ; +else + maniptype =NF_NAT_MANIP_SRC ; - err =ovs_ct_nat_execute (skb, ct, ctinfo, &info->range, - maniptype); + err =ovs_ct_nat_execute (skb, ct, ctinfo, &info->range, + maniptype); + }else if (CTINFO2DIR (ctinfo) ==IP_CT_DIR_ORIGINAL ) { + err =ovs_ct_nat_execute (skb, ct, ctinfo,NULL , +NF_NAT_MANIP_SRC ); + } }/* Mark NAT done if successful and update the flow key. */
Greg Kroah-Hartman
maintainerPATCH 51/70 net: team: fix memory leak in __team_options_register
In reply to Greg Kroah-HartmanFrom: Anant Thazhemadam <[email protected]>
commit 9a9e77495958c7382b2438bc19746dd3aaaabb8e upstream.
The variable "i" isn't initialized back correctly after the first loop under the label inst_rollback gets executed.
The value of "i" is assigned to be option_count - 1, and the ensuing loop (under alloc_rollback) begins by initializing i--. Thus, the value of i when the loop begins execution will now become i = option_count - 2.
Thus, when kfree(dst_opts[i]) is called in the second loop in this order, (i.e., inst_rollback followed by alloc_rollback), dst_optsp[option_count - 2] is the first element freed, and dst_opts[option_count - 1] does not get freed, and thus, a memory leak is caused.
This memory leak can be fixed, by assigning i = option_count (instead of option_count - 1).
--- drivers/net/team/team.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/team/team.c +1 -1
@@ -299,7 +299,7 @@ inst_rollback:for (i--; i >=0 ; i--)__team_option_inst_del_option (team, dst_opts[i]); - i = option_count -1 ; + i = option_count; alloc_rollback:for (i--; i >=0 ; i--)kfree (dst_opts[i]);
Greg Kroah-Hartman
maintainerPATCH 70/70 net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails
In reply to Greg Kroah-HartmanFrom: Anant Thazhemadam <[email protected]>
commit f45a4248ea4cc13ed50618ff066849f9587226b2 upstream.
When get_registers() fails in set_ethernet_addr(),the uninitialized value of node_id gets copied over as the address.
So, check the return value of get_registers().
If get_registers() executed successfully (i.e., it returns sizeof(node_id)), copy over the MAC address using ether_addr_copy() (instead of using memcpy()).
Else, if get_registers() failed instead, a randomly generated MAC address is set as the MAC address instead.
--- drivers/net/usb/rtl8150.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/usb/rtl8150.c +12 -4
@@ -277,12 +277,20 @@ static int write_mii_word(rtl8150_t * dereturn 1 ; } -static inline void set_ethernet_addr (rtl8150_t * dev) +static void set_ethernet_addr (rtl8150_t *dev) { -u8 node_id[6 ]; +u8 node_id[ETH_ALEN ]; +int ret; -get_registers (dev,IDR ,sizeof (node_id), node_id); -memcpy (dev->netdev->dev_addr, node_id,sizeof (node_id)); + ret =get_registers (dev,IDR ,sizeof (node_id), node_id); + +if (ret ==sizeof (node_id)) { +ether_addr_copy (dev->netdev->dev_addr, node_id); + }else { +eth_hw_addr_random (dev->netdev); +netdev_notice (dev->netdev,"Assigned a random MAC address: %pM\n" , + dev->netdev->dev_addr); + } }static int rtl8150_set_mac_address (struct net_device *netdev,void *p)
Greg Kroah-Hartman
maintainerPATCH 69/70 mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged
In reply to Greg Kroah-HartmanFrom: Vijay Balakrishna <[email protected]>
commit 4aab2be0983031a05cb4a19696c9da5749523426 upstream.
When memory is hotplug added or removed the min_free_kbytes should be recalculated based on what is expected by khugepaged. Currently after hotplug, min_free_kbytes will be set to a lower default and higher default set when THP enabled is lost.
This change restores min_free_kbytes as expected for THP consumers.
--- include/linux/khugepaged.h | 5 +++++ mm/khugepaged.c | 13 +++++++++++-- mm/page_alloc.c | 3 +++ 3 files changed, 19 insertions(+), 2 deletions(-)
include/linux/khugepaged.h +5 -0
@@ -15,6 +15,7 @@ extern int __khugepaged_enter(struct mm_extern void __khugepaged_exit (struct mm_struct *mm);extern int khugepaged_enter_vma_merge (struct vm_area_struct *vma,unsigned long vm_flags); +extern void khugepaged_min_free_kbytes_update (void );#define khugepaged_enabled () \ (transparent_hugepage_flags & \
@@ -73,6 +74,10 @@ static inline int khugepaged_enter_vma_m {return 0 ; } + +static inline void khugepaged_min_free_kbytes_update (void ) +{ +}#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #endif /* _LINUX_KHUGEPAGED_H */
mm/khugepaged.c +11 -2
@@ -53,6 +53,9 @@ enum scan_result {#define CREATE_TRACE_POINTS #include <trace/events/huge_memory.h> +static struct task_struct *khugepaged_thread__read_mostly ; +static DEFINE_MUTEX (khugepaged_mutex); +/* default scan 8*512 pte (or vmas) every 30 second */ static unsigned int khugepaged_pages_to_scan__read_mostly ;static unsigned int khugepaged_pages_collapsed;
@@ -1949,8 +1952,6 @@ static void set_recommended_min_free_kbyint start_stop_khugepaged (void ) { -static struct task_struct *khugepaged_thread__read_mostly ; -static DEFINE_MUTEX (khugepaged_mutex);int err =0 ;mutex_lock (&khugepaged_mutex);
@@ -1977,3 +1978,11 @@ fail:mutex_unlock (&khugepaged_mutex);return err; } + +void khugepaged_min_free_kbytes_update (void ) +{ +mutex_lock (&khugepaged_mutex); +if (khugepaged_enabled () && khugepaged_thread) +set_recommended_min_free_kbytes (); +mutex_unlock (&khugepaged_mutex); +}
mm/page_alloc.c +3 -0
@@ -67,6 +67,7 @@#include <linux/ftrace.h> #include <linux/lockdep.h> #include <linux/nmi.h> +#include <linux/khugepaged.h> #include <asm/sections.h> #include <asm/tlbflush.h>
@@ -7021,6 +7022,8 @@ int __meminit init_per_zone_wmark_min(vosetup_min_slab_ratio ();#endif +khugepaged_min_free_kbytes_update (); +return 0 ; }postcore_initcall (init_per_zone_wmark_min)
Greg Kroah-Hartman
maintainerPATCH 62/70 net: usb: ax88179_178a: fix missing stop entry in driver_info
In reply to Greg Kroah-HartmanFrom: Wilken Gottwalt <[email protected]>
[ Upstream commit 9666ea66a74adfe295cb3a8760c76e1ef70f9caf ]
Adds the missing .stop entry in the Belkin driver_info structure.
--- drivers/net/usb/ax88179_178a.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/ax88179_178a.c +1 -0
@@ -1736,6 +1736,7 @@ static const struct driver_info belkin_info = { .status = ax88179_status, .link_reset = ax88179_link_reset, .reset = ax88179_reset, + .stop = ax88179_stop, .flags = FLAG_ETHER | FLAG_FRAMING_AX, .rx_fixup = ax88179_rx_fixup, .tx_fixup = ax88179_tx_fixup,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 66/70 rxrpc: Fix server keyring leak
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 38b1dc47a35ba14c3f4472138ea56d014c2d609b ]
If someone calls setsockopt() twice to set a server key keyring, the first keyring is leaked.
Fix it to return an error instead if the server key keyring is already set.
--- net/rxrpc/key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rxrpc/key.c +1 -1
@@ -905,7 +905,7 @@ int rxrpc_request_key(struct rxrpc_sock *rx, char __user *optval, int optlen)_enter ("" ); -if (optlen <=0 || optlen >PAGE_SIZE -1 ) +if (optlen <=0 || optlen >PAGE_SIZE -1 || rx->securities)return -EINVAL ; description =memdup_user_nul (optval, optlen);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 63/70 rxrpc: Fix rxkad token xdr encoding
In reply to Greg Kroah-HartmanFrom: Marc Dionne <[email protected]>
[ Upstream commit 56305118e05b2db8d0395bba640ac9a3aee92624 ]
The session key should be encoded with just the 8 data bytes and no length; ENCODE_DATA precedes it with a 4 byte length, which confuses some existing tools that try to parse this format.
Add an ENCODE_BYTES macro that does not include a length, and use it for the key. Also adjust the expected length.
Note that commit 774521f353e1d ("rxrpc: Fix an assertion in rxrpc_read()") had fixed a BUG by changing the length rather than fixing the encoding. The original length was correct.
--- net/rxrpc/key.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/rxrpc/key.c +10 -2
@@ -1075,7 +1075,7 @@ static long rxrpc_read(const struct key *key,switch (token->security_index) {case RXRPC_SECURITY_RXKAD : - toksize +=9 *4 ;/* viceid, kvno, key*2 + len, begin, + toksize +=8 *4 ;/* viceid, kvno, key*2, begin, * end, primary, tktlen */ toksize +=RND (token->kad->ticket_len);break ;
@@ -1141,6 +1141,14 @@ static long rxrpc_read(const struct key *key,memcpy ((u8 *)xdr + _l, &zero,4 - (_l &3 )); \ xdr += (_l +3 ) >>2 ; \ } while(0) +#define ENCODE_BYTES (l, s) \ + do { \ + u32 _l = (l); \ + memcpy(xdr, (s), _l); \ + if (_l & 3) \ + memcpy((u8 *)xdr + _l, &zero, 4 - (_l & 3)); \ + xdr += (_l + 3) >> 2; \ + } while(0)#define ENCODE64 (x) \ do { \ __be64 y = cpu_to_be64(x); \
@@ -1168,7 +1176,7 @@ static long rxrpc_read(const struct key *key,case RXRPC_SECURITY_RXKAD :ENCODE (token->kad->vice_id);ENCODE (token->kad->kvno); -ENCODE_DATA (8 , token->kad->session_key); +ENCODE_BYTES (8 , token->kad->session_key);ENCODE (token->kad->start);ENCODE (token->kad->expiry);ENCODE (token->kad->primary_flag);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 64/70 rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read()
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 9a059cd5ca7d9c5c4ca5a6e755cf72f230176b6a ]
If rxrpc_read() (which allows KEYCTL_READ to read a key), sees a token of a type it doesn't recognise, it can BUG in a couple of places, which is unnecessary as it can easily get back to userspace.
Fix this to print an error message instead.
--- net/rxrpc/key.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/rxrpc/key.c +2 -2
@@ -1110,7 +1110,8 @@ static long rxrpc_read(const struct key *key,break ;default :/* we have a ticket we can't encode */ -BUG (); +pr_err ("Unsupported key token type (%u)\n" , + token->security_index);continue ; }
@@ -1226,7 +1227,6 @@ static long rxrpc_read(const struct key *key,break ;default : -BUG ();break ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 67/70 perf: Fix task_function_call() error handling
In reply to Greg Kroah-HartmanFrom: Kajol Jain <[email protected]>
[ Upstream commit 6d6b8b9f4fceab7266ca03d194f60ec72bd4b654 ]
The error handling introduced by commit:
2ed6edd33a21 ("perf: Add cond_resched() to task_function_call()")
looses any return value from smp_call_function_single() that is not {0, -EINVAL}. This is a problem because it will return -EXNIO when the target CPU is offline. Worse, in that case it'll turn into an infinite loop.
--- kernel/events/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/events/core.c +3 -2
@@ -98,7 +98,7 @@ static void remote_function(void *data)* retry due to any failures in smp_call_function_single(), such as if the * task_cpu() goes offline concurrently. * -* returns @func return value or -ESRCH when the process isn't running +* returns @func return value or -ESRCH or -ENXIO when the process isn't running */ static int task_function_call (struct task_struct *p,remote_function_f func,void *info)
@@ -114,7 +114,8 @@ task_function_call(struct task_struct *p, remote_function_f func, void *info)for (;;) { ret =smp_call_function_single (task_cpu (p), remote_function, &data,1 ); - ret = !ret ? data.ret : -EAGAIN ; +if (!ret) + ret = data.ret;if (ret != -EAGAIN )break ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 68/70 mmc: core: dont set limits.discard_granularity as 0
In reply to Greg Kroah-HartmanFrom: Coly Li <[email protected]>
[ Upstream commit 4243219141b67d7c2fdb2d8073c17c539b9263eb ]
In mmc_queue_setup_discard() the mmc driver queue's discard_granularity might be set as 0 (when card->pref_erase > max_discard) while the mmc device still declares to support discard operation. This is buggy and triggered the following kernel warning message,
WARNING: CPU: 0 PID: 135 at __blkdev_issue_discard+0x200/0x294 CPU: 0 PID: 135 Comm: f2fs_discard-17 Not tainted 5.9.0-rc6 #1 Hardware name: Google Kevin (DT) pstate: 00000005 (nzcv daif -PAN -UAO BTYPE=--) pc : __blkdev_issue_discard+0x200/0x294 lr : __blkdev_issue_discard+0x54/0x294 sp : ffff800011dd3b10 x29: ffff800011dd3b10 x28: 0000000000000000 x27: ffff800011dd3cc4 x26: ffff800011dd3e18 x25: 000000000004e69b x24: 0000000000000c40 x23: ffff0000f1deaaf0 x22: ffff0000f2849200 x21: 00000000002734d8 x20: 0000000000000008 x19: 0000000000000000 x18: 0000000000000000 x17: 0000000000000000 x16: 0000000000000000 x15: 0000000000000000 x14: 0000000000000394 x13: 0000000000000000 x12: 0000000000000000 x11: 0000000000000000 x10: 00000000000008b0 x9 : ffff800011dd3cb0 x8 : 000000000004e69b x7 : 0000000000000000 x6 : ffff0000f1926400 x5 : ffff0000f1940800 x4 : 0000000000000000 x3 : 0000000000000c40 x2 : 0000000000000008 x1 : 00000000002734d8 x0 : 0000000000000000 Call trace: __blkdev_issue_discard+0x200/0x294 __submit_discard_cmd+0x128/0x374 __issue_discard_cmd_orderly+0x188/0x244 __issue_discard_cmd+0x2e8/0x33c issue_discard_thread+0xe8/0x2f0 kthread+0x11c/0x120 ret_from_fork+0x10/0x1c ---[ end trace e4c8023d33dfe77a ]---
This patch fixes the issue by setting discard_granularity as SECTOR_SIZE instead of 0 when (card->pref_erase > max_discard) is true. Now no more complain from __blkdev_issue_discard() for the improper value of discard granularity.
This issue is exposed after commit b35fd7422c2f ("block: check queue's limits.discard_granularity in __blkdev_issue_discard()"), a "Fixes:" tag is also added for the commit to make sure people won't miss this patch after applying the change of __blkdev_issue_discard().
--- drivers/mmc/core/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/core/queue.c +1 -1
@@ -143,7 +143,7 @@ static void mmc_queue_setup_discard(struct request_queue *q, q->limits.discard_granularity = card->pref_erase <<9 ;/* granularity must not be greater than max. discard */ if (card->pref_erase > max_discard) - q->limits.discard_granularity =0 ; + q->limits.discard_granularity =SECTOR_SIZE ;if (mmc_can_secure_erase_trim (card))queue_flag_set_unlocked (QUEUE_FLAG_SECERASE , q); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 61/70 mdio: fix mdio-thunder.c dependency & build error
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7dbbcf496f2a4b6d82cfc7810a0746e160b79762 ]
Fix build error by selecting MDIO_DEVRES for MDIO_THUNDER. Fixes this build error:
ld: drivers/net/phy/mdio-thunder.o: in function `thunder_mdiobus_pci_probe':drivers/net/phy/mdio-thunder.c:78: undefined reference to `devm_mdiobus_alloc_size'
--- drivers/net/phy/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/phy/Kconfig +1 -0
@@ -146,6 +146,7 @@ config MDIO_THUNDER depends on 64BIT depends on PCI select MDIO_CAVIUM + select MDIO_DEVRES help This driver supports the MDIO interfaces found on Cavium ThunderX SoCs when the MDIO bus device appears as a PCI
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 50/70 team: set dev->needed_headroom in team_setup_by_port()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 89d01748b2354e210b5d4ea47bc25a42a1b42c82 upstream.
Some devices set needed_headroom. If we ignore it, we might end up crashing in various skb_push() for example in ipgre_header() since some layers assume enough headroom has been reserved.
--- drivers/net/team/team.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/team/team.c +1 -0
@@ -2078,6 +2078,7 @@ static void team_setup_by_port(struct ne dev->header_ops = port_dev->header_ops; dev->type = port_dev->type; dev->hard_header_len = port_dev->hard_header_len; + dev->needed_headroom = port_dev->needed_headroom; dev->addr_len = port_dev->addr_len; dev->mtu = port_dev->mtu;memcpy (dev->broadcast, port_dev->broadcast, port_dev->addr_len);
Greg Kroah-Hartman
maintainerPATCH 65/70 rxrpc: Fix some missing _bh annotations on locking conn->state_lock
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit fa1d113a0f96f9ab7e4fe4f8825753ba1e34a9d3 ]
conn->state_lock may be taken in softirq mode, but a previous patch replaced an outer lock in the response-packet event handling code, and lost the _bh from that when doing so.
Fix this by applying the _bh annotation to the state_lock locking.
--- net/rxrpc/conn_event.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/rxrpc/conn_event.c +3 -3
@@ -316,18 +316,18 @@ static int rxrpc_process_event(struct rxrpc_connection *conn,return ret;spin_lock (&conn->channel_lock); -spin_lock (&conn->state_lock); +spin_lock_bh (&conn->state_lock);if (conn->state ==RXRPC_CONN_SERVICE_CHALLENGING ) { conn->state =RXRPC_CONN_SERVICE ; -spin_unlock (&conn->state_lock); +spin_unlock_bh (&conn->state_lock);for (loop =0 ; loop <RXRPC_MAXCALLS ; loop++)rxrpc_call_is_secure (rcu_dereference_protected ( conn->channels[loop].call,lockdep_is_held (&conn->channel_lock))); }else { -spin_unlock (&conn->state_lock); +spin_unlock_bh (&conn->state_lock); }spin_unlock (&conn->channel_lock);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 60/70 bonding: set dev->needed_headroom in bond_setup_by_slave()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit f32f19339596b214c208c0dba716f4b6cc4f6958 ]
syzbot managed to crash a host by creating a bond
with a GRE device.
For non Ethernet device, bonding calls bond_setup_by_slave() instead of ether_setup(), and unfortunately dev->needed_headroom was not copied from the new added member.
[ 171.243095] skbuff: skb_under_panic: text:ffffffffa184b9ea len:116 put:20 head:ffff883f84012dc0 data:ffff883f84012dbc tail:0x70 end:0xd00 dev:bond0 [ 171.243111] ------------[ cut here ]------------ [ 171.243112] kernel BUG at net/core/skbuff.c:112! [ 171.243117] invalid opcode: 0000 [#1] SMP KASAN PTI [ 171.243469] gsmi: Log Shutdown Reason 0x03 [ 171.243505] Call Trace: [ 171.243506] <IRQ> [ 171.243512] [<ffffffffa171be59>] skb_push+0x49/0x50 [ 171.243516] [<ffffffffa184b9ea>] ipgre_header+0x2a/0xf0 [ 171.243520] [<ffffffffa17452d7>] neigh_connected_output+0xb7/0x100 [ 171.243524] [<ffffffffa186f1d3>] ip6_finish_output2+0x383/0x490 [ 171.243528] [<ffffffffa186ede2>] __ip6_finish_output+0xa2/0x110 [ 171.243531] [<ffffffffa186acbc>] ip6_finish_output+0x2c/0xa0 [ 171.243534] [<ffffffffa186abe9>] ip6_output+0x69/0x110 [ 171.243537] [<ffffffffa186ac90>] ? ip6_output+0x110/0x110 [ 171.243541] [<ffffffffa189d952>] mld_sendpack+0x1b2/0x2d0 [ 171.243544] [<ffffffffa189d290>] ? mld_send_report+0xf0/0xf0 [ 171.243548] [<ffffffffa189c797>] mld_ifc_timer_expire+0x2d7/0x3b0 [ 171.243551] [<ffffffffa189c4c0>] ? mld_gq_timer_expire+0x50/0x50 [ 171.243556] [<ffffffffa0fea270>] call_timer_fn+0x30/0x130 [ 171.243559] [<ffffffffa0fea17c>] expire_timers+0x4c/0x110 [ 171.243563] [<ffffffffa0fea0e3>] __run_timers+0x213/0x260 [ 171.243566] [<ffffffffa0fecb7d>] ? ktime_get+0x3d/0xa0 [ 171.243570] [<ffffffffa0ff9c4e>] ? clockevents_program_event+0x7e/0xe0 [ 171.243574] [<ffffffffa0f7e5d5>] ? sched_clock_cpu+0x15/0x190 [ 171.243577] [<ffffffffa0fe973d>] run_timer_softirq+0x1d/0x40 [ 171.243581] [<ffffffffa1c00152>] __do_softirq+0x152/0x2f0 [ 171.243585] [<ffffffffa0f44e1f>] irq_exit+0x9f/0xb0 [ 171.243588] [<ffffffffa1a02e1d>] smp_apic_timer_interrupt+0xfd/0x1a0 [ 171.243591] [<ffffffffa1a01ea6>] apic_timer_interrupt+0x86/0x90
--- drivers/net/bonding/bond_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/bonding/bond_main.c +1 -0
@@ -1129,6 +1129,7 @@ static void bond_setup_by_slave(struct net_device *bond_dev, bond_dev->type = slave_dev->type; bond_dev->hard_header_len = slave_dev->hard_header_len; + bond_dev->needed_headroom = slave_dev->needed_headroom; bond_dev->addr_len = slave_dev->addr_len; memcpy(bond_dev->broadcast, slave_dev->broadcast,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 59/70 xfrm: Use correct address family in xfrm_state_find
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit e94ee171349db84c7cfdc5fefbebe414054d0924 ]
The struct flowi must never be interpreted by itself as its size depends on the address family. Therefore it must always be grouped with its original family value.
In this particular instance, the original family value is lost in the function xfrm_state_find. Therefore we get a bogus read when it's coupled with the wrong family which would occur with inter- family xfrm states.
This patch fixes it by keeping the original family value.
Note that the same bug could potentially occur in LSM through the xfrm_state_pol_flow_match hook. I checked the current code there and it seems to be safe for now as only secid is used which is part of struct flowi_common. But that API should be changed so that so that we don't get new bugs in the future. We could do that by replacing fl with just secid or adding a family field.
--- net/xfrm/xfrm_state.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
net/xfrm/xfrm_state.c +7 -4
@@ -909,7 +909,8 @@ static void xfrm_state_look_at(struct xfrm_policy *pol, struct xfrm_state *x,*/ if (x->km.state ==XFRM_STATE_VALID ) {if ((x->sel.family && - !xfrm_selector_match (&x->sel, fl, x->sel.family)) || + (x->sel.family != family || + !xfrm_selector_match (&x->sel, fl, family))) || !security_xfrm_state_pol_flow_match (x, pol, fl))return ;
@@ -922,7 +923,9 @@ static void xfrm_state_look_at(struct xfrm_policy *pol, struct xfrm_state *x, *acq_in_progress =1 ; }else if (x->km.state ==XFRM_STATE_ERROR || x->km.state ==XFRM_STATE_EXPIRED ) { -if (xfrm_selector_match (&x->sel, fl, x->sel.family) && +if ((!x->sel.family || + (x->sel.family == family && +xfrm_selector_match (&x->sel, fl, family))) &&security_xfrm_state_pol_flow_match (x, pol, fl)) *error = -ESRCH ; }
@@ -961,7 +964,7 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, tmpl->mode == x->props.mode && tmpl->id.proto == x->id.proto && (tmpl->id.spi == x->id.spi || !tmpl->id.spi)) -xfrm_state_look_at (pol, x, fl, encap_family, +xfrm_state_look_at (pol, x, fl, family, &best, &acquire_in_progress, &error); }if (best || acquire_in_progress)
@@ -977,7 +980,7 @@ xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr, tmpl->mode == x->props.mode && tmpl->id.proto == x->id.proto && (tmpl->id.spi == x->id.spi || !tmpl->id.spi)) -xfrm_state_look_at (pol, x, fl, encap_family, +xfrm_state_look_at (pol, x, fl, family, &best, &acquire_in_progress, &error); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 58/70 platform/x86: fix kconfig dependency warning for FUJITSU_LAPTOP
In reply to Greg Kroah-HartmanFrom: Necip Fazil Yildiran <[email protected]>
[ Upstream commit afdd1ebb72051e8b6b83c4d7dc542a9be0e1352d ]
When FUJITSU_LAPTOP is enabled and NEW_LEDS is disabled, it results in the following Kbuild warning:
WARNING: unmet direct dependencies detected for LEDS_CLASS
Depends on [n]: NEW_LEDS [=n]
Selected by [y]:
- FUJITSU_LAPTOP [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] && ACPI [=y] && INPUT [=y] && BACKLIGHT_CLASS_DEVICE [=y] && (ACPI_VIDEO [=n] || ACPI_VIDEO [=n]=n)
The reason is that FUJITSU_LAPTOP selects LEDS_CLASS without depending on or selecting NEW_LEDS while LEDS_CLASS is subordinate to NEW_LEDS.
Honor the kconfig menu hierarchy to remove kconfig dependency warnings.
--- drivers/platform/x86/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/Kconfig +1 -0
@@ -183,6 +183,7 @@ config FUJITSU_LAPTOP depends on BACKLIGHT_CLASS_DEVICE depends on ACPI_VIDEO || ACPI_VIDEO = n select INPUT_SPARSEKMAP + select NEW_LEDS select LEDS_CLASS ---help--- This is a driver for laptops built by Fujitsu:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 48/70 i2c: meson: fix clock setting overwrite
In reply to Greg Kroah-HartmanFrom: Jerome Brunet <[email protected]>
commit 28683e847e2f20eed22cdd24f185d7783db396d3 upstream.
When the slave address is written in do_start(), SLAVE_ADDR is written completely. This may overwrite some setting related to the clock rate or signal filtering.
Fix this by writing only the bits related to slave address. To avoid causing unexpected changed, explicitly disable filtering or high/low clock mode which may have been left over by the bootloader.
--- drivers/i2c/busses/i2c-meson.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-meson.c +18 -1
@@ -8,6 +8,7 @@* published by the Free Software Foundation. */ +#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/completion.h> #include <linux/i2c.h>
@@ -39,6 +40,12 @@#define REG_CTRL_CLKDIVEXT_SHIFT 28#define REG_CTRL_CLKDIVEXT_MASK GENMASK(29, 28) +#define REG_SLV_ADDR GENMASK(7, 0) +#define REG_SLV_SDA_FILTER GENMASK(10, 8) +#define REG_SLV_SCL_FILTER GENMASK(13, 11) +#define REG_SLV_SCL_LOW GENMASK(27, 16) +#define REG_SLV_SCL_LOW_EN BIT(28) +#define I2C_TIMEOUT_MS 500enum {
@@ -142,6 +149,9 @@ static void meson_i2c_set_clk_div(structmeson_i2c_set_mask (i2c,REG_CTRL ,REG_CTRL_CLKDIVEXT_MASK , (div >>10 ) <<REG_CTRL_CLKDIVEXT_SHIFT ); +/* Disable HIGH/LOW mode */ +meson_i2c_set_mask (i2c,REG_SLAVE_ADDR ,REG_SLV_SCL_LOW_EN ,0 ); +dev_dbg (i2c->dev,"%s: clk %lu, freq %u, div %u\n" , __func__, clk_rate, freq, div); }
@@ -269,7 +279,10 @@ static void meson_i2c_do_start(struct me token = (msg->flags &I2C_M_RD ) ?TOKEN_SLAVE_ADDR_READ :TOKEN_SLAVE_ADDR_WRITE ; -writel (msg->addr <<1 , i2c->regs +REG_SLAVE_ADDR ); + +meson_i2c_set_mask (i2c,REG_SLAVE_ADDR ,REG_SLV_ADDR , +FIELD_PREP (REG_SLV_ADDR , msg->addr <<1 )); +meson_i2c_add_token (i2c,TOKEN_START );meson_i2c_add_token (i2c, token); }
@@ -425,6 +438,10 @@ static int meson_i2c_probe(struct platforeturn ret; } +/* Disable filtering */ +meson_i2c_set_mask (i2c,REG_SLAVE_ADDR , +REG_SLV_SDA_FILTER |REG_SLV_SCL_FILTER ,0 ); +meson_i2c_set_clk_div (i2c, timings.bus_freq_hz);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 49/70 sctp: fix sctp_auth_init_hmacs() error path
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit d42ee76ecb6c49d499fc5eb32ca34468d95dbc3e upstream.
After freeing ep->auth_hmacs we have to clear the pointer or risk use-after-free as reported by syzbot:
BUG: KASAN: use-after-free in sctp_auth_destroy_hmacs net/sctp/auth.c:509 [inline] BUG: KASAN: use-after-free in sctp_auth_destroy_hmacs net/sctp/auth.c:501 [inline] BUG: KASAN: use-after-free in sctp_auth_free+0x17e/0x1d0 net/sctp/auth.c:1070 Read of size 8 at addr ffff8880a8ff52c0 by task syz-executor941/6874 CPU: 0 PID: 6874 Comm: syz-executor941 Not tainted 5.9.0-rc8-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x198/0x1fd lib/dump_stack.c:118 print_address_description.constprop.0.cold+0xae/0x497 mm/kasan/report.c:383 __kasan_report mm/kasan/report.c:513 [inline] kasan_report.cold+0x1f/0x37 mm/kasan/report.c:530 sctp_auth_destroy_hmacs net/sctp/auth.c:509 [inline] sctp_auth_destroy_hmacs net/sctp/auth.c:501 [inline] sctp_auth_free+0x17e/0x1d0 net/sctp/auth.c:1070 sctp_endpoint_destroy+0x95/0x240 net/sctp/endpointola.c:203 sctp_endpoint_put net/sctp/endpointola.c:236 [inline] sctp_endpoint_free+0xd6/0x110 net/sctp/endpointola.c:183 sctp_destroy_sock+0x9c/0x3c0 net/sctp/socket.c:4981 sctp_v6_destroy_sock+0x11/0x20 net/sctp/socket.c:9415 sk_common_release+0x64/0x390 net/core/sock.c:3254 sctp_close+0x4ce/0x8b0 net/sctp/socket.c:1533 inet_release+0x12e/0x280 net/ipv4/af_inet.c:431 inet6_release+0x4c/0x70 net/ipv6/af_inet6.c:475 __sock_release+0xcd/0x280 net/socket.c:596 sock_close+0x18/0x20 net/socket.c:1277 __fput+0x285/0x920 fs/file_table.c:281 task_work_run+0xdd/0x190 kernel/task_work.c:141 exit_task_work include/linux/task_work.h:25 [inline] do_exit+0xb7d/0x29f0 kernel/exit.c:806 do_group_exit+0x125/0x310 kernel/exit.c:903 __do_sys_exit_group kernel/exit.c:914 [inline] __se_sys_exit_group kernel/exit.c:912 [inline] __x64_sys_exit_group+0x3a/0x50 kernel/exit.c:912 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x43f278 Code: Bad RIP value. RSP: 002b:00007fffe0995c38 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 000000000043f278 RDX: 0000000000000000 RSI: 000000000000003c RDI: 0000000000000000 RBP: 00000000004bf068 R08: 00000000000000e7 R09: ffffffffffffffd0 R10: 0000000020000000 R11: 0000000000000246 R12: 0000000000000001 R13: 00000000006d1180 R14: 0000000000000000 R15: 0000000000000000 Allocated by task 6874: kasan_save_stack+0x1b/0x40 mm/kasan/common.c:48 kasan_set_track mm/kasan/common.c:56 [inline] __kasan_kmalloc.constprop.0+0xbf/0xd0 mm/kasan/common.c:461 kmem_cache_alloc_trace+0x174/0x300 mm/slab.c:3554 kmalloc include/linux/slab.h:554 [inline] kmalloc_array include/linux/slab.h:593 [inline] kcalloc include/linux/slab.h:605 [inline] sctp_auth_init_hmacs+0xdb/0x3b0 net/sctp/auth.c:464 sctp_auth_init+0x8a/0x4a0 net/sctp/auth.c:1049 sctp_setsockopt_auth_supported net/sctp/socket.c:4354 [inline] sctp_setsockopt+0x477e/0x97f0 net/sctp/socket.c:4631 __sys_setsockopt+0x2db/0x610 net/socket.c:2132 __do_sys_setsockopt net/socket.c:2143 [inline] __se_sys_setsockopt net/socket.c:2140 [inline] __x64_sys_setsockopt+0xba/0x150 net/socket.c:2140 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Freed by task 6874: kasan_save_stack+0x1b/0x40 mm/kasan/common.c:48 kasan_set_track+0x1c/0x30 mm/kasan/common.c:56 kasan_set_free_info+0x1b/0x30 mm/kasan/generic.c:355 __kasan_slab_free+0xd8/0x120 mm/kasan/common.c:422 __cache_free mm/slab.c:3422 [inline] kfree+0x10e/0x2b0 mm/slab.c:3760 sctp_auth_destroy_hmacs net/sctp/auth.c:511 [inline] sctp_auth_destroy_hmacs net/sctp/auth.c:501 [inline] sctp_auth_init_hmacs net/sctp/auth.c:496 [inline] sctp_auth_init_hmacs+0x2b7/0x3b0 net/sctp/auth.c:454 sctp_auth_init+0x8a/0x4a0 net/sctp/auth.c:1049 sctp_setsockopt_auth_supported net/sctp/socket.c:4354 [inline] sctp_setsockopt+0x477e/0x97f0 net/sctp/socket.c:4631 __sys_setsockopt+0x2db/0x610 net/socket.c:2132 __do_sys_setsockopt net/socket.c:2143 [inline] __se_sys_setsockopt net/socket.c:2140 [inline] __x64_sys_setsockopt+0xba/0x150 net/socket.c:2140 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- net/sctp/auth.c | 1 + 1 file changed, 1 insertion(+)
net/sctp/auth.c +1 -0
@@ -493,6 +493,7 @@ int sctp_auth_init_hmacs(struct sctp_end out_err:/* Clean up any successful allocations */ sctp_auth_destroy_hmacs (ep->auth_hmacs); + ep->auth_hmacs =NULL ;return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 55/70 xfrm: clone XFRMA_SEC_CTX in xfrm_do_migrate
In reply to Greg Kroah-HartmanFrom: Antony Antony <[email protected]>
[ Upstream commit 7aa05d304785204703a67a6aa7f1db402889a172 ]
XFRMA_SEC_CTX was not cloned from the old to the new. Migrate this attribute during XFRMA_MSG_MIGRATE
v1->v2:
- return -ENOMEM on errorv2->v3:
- fix return type to int
--- net/xfrm/xfrm_state.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
net/xfrm/xfrm_state.c +28 -0
@@ -1320,6 +1320,30 @@ out:EXPORT_SYMBOL (xfrm_state_add);#ifdef CONFIG_XFRM_MIGRATE +static inline int clone_security (struct xfrm_state *x,struct xfrm_sec_ctx *security) +{ +struct xfrm_user_sec_ctx *uctx; +int size =sizeof (*uctx) + security->ctx_len; +int err; + + uctx =kmalloc (size,GFP_KERNEL ); +if (!uctx) +return -ENOMEM ; + + uctx->exttype =XFRMA_SEC_CTX ; + uctx->len = size; + uctx->ctx_doi = security->ctx_doi; + uctx->ctx_alg = security->ctx_alg; + uctx->ctx_len = security->ctx_len; +memcpy (uctx +1 , security->ctx_str, security->ctx_len); + err =security_xfrm_state_alloc (x, uctx); +kfree (uctx); +if (err) +return err; + +return 0 ; +} +static struct xfrm_state *xfrm_state_clone (struct xfrm_state *orig,struct xfrm_encap_tmpl *encap) {
@@ -1376,6 +1400,10 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, goto error; } +if (orig->security) +if (clone_security (x, orig->security)) + goto error; +if (orig->coaddr) { x->coaddr =kmemdup (orig->coaddr,sizeof (*x->coaddr),GFP_KERNEL );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 38/70 platform/x86: thinkpad_acpi: initialize tp_nvram_state variable
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
commit 5f38b06db8af3ed6c2fc1b427504ca56fae2eacc upstream.
clang static analysis flags this represenative problem thinkpad_acpi.c:2523:7: warning: Branch condition evaluates
to a garbage value
if (!oldn->mute ||
^~~~~~~~~~~In hotkey_kthread() mute is conditionally set by hotkey_read_nvram() but unconditionally checked by hotkey_compare_and_issue_event(). So the tp_nvram_state variable s[2] needs to be initialized.
--- drivers/platform/x86/thinkpad_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/thinkpad_acpi.c +1 -1
@@ -2477,7 +2477,7 @@ static void hotkey_compare_and_issue_eve*/ static int hotkey_kthread (void *data) { -struct tp_nvram_state s[2 ]; +struct tp_nvram_state s[2 ] = {0 };u32 poll_mask, event_mask;unsigned int si, so;unsigned long t;
Greg Kroah-Hartman
maintainerPATCH 42/70 mtd: rawnand: sunxi: Fix the probe error path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
commit 3d84515ffd8fb657e10fa5b1215e9f095fa7efca upstream.
nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead.
--- drivers/mtd/nand/sunxi_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/sunxi_nand.c +1 -1
@@ -2125,7 +2125,7 @@ static int sunxi_nand_chip_init(struct d ret =mtd_device_register (mtd,NULL ,0 );if (ret) {dev_err (dev,"failed to register mtd device: %d\n" , ret); -nand_release (nand); +nand_cleanup (nand);return ret; }
Greg Kroah-Hartman
maintainerPATCH 41/70 perf top: Fix stdio interface input handling with glibc 2.28+
In reply to Greg Kroah-HartmanFrom: Tommi Rantala <[email protected]>
commit 29b4f5f188571c112713c35cc87eefb46efee612 upstream.
Since glibc 2.28 when running 'perf top --stdio', input handling no longer works, but hitting any key always just prints the "Mapped keys" help text.
To fix it, call clearerr() in the display_thread() loop to clear any EOF sticky errors, as instructed in the glibc NEWS file
(https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS):
* All stdio functions now treat end-of-file as a sticky condition. If you read from a file until EOF, and then the file is enlarged by another process, you must call clearerr or another function with the same effect (e.g. fseek, rewind) before you can read the additional data. This corrects a longstanding C99 conformance bug. It is most likely to affect programs that use stdio to read interactive input from a terminal. (Bug #1190.)
--- tools/perf/builtin-top.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/builtin-top.c +3 -1
@@ -652,7 +652,9 @@ repeat: delay_msecs = top->delay_secs *MSEC_PER_SEC ;set_term_quiet_input (&save);/* trash return*/ -getc (stdin); +clearerr (stdin); +if (poll (&stdin_poll,1 ,0 ) >0 ) +getc (stdin);while (!done) {perf_top__print_sym_table (top);
Greg Kroah-Hartman
maintainerPATCH 33/70 Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
commit 6735b4632def0640dbdf4eb9f99816aca18c4f16 upstream.
syzbot has reported an issue in the framebuffer layer, where a malicious user may overflow our built-in font data buffers.
In order to perform a reliable range check, subsystems need to know FONTDATAMAX for each built-in font. Unfortunately, our font descriptor, struct console_font does not contain FONTDATAMAX, and is part of the UAPI, making it infeasible to modify it.
For user-provided fonts, the framebuffer layer resolves this issue by reserving four extra words at the beginning of data buffers. Later, whenever a function needs to access them, it simply uses the following macros:
Recently we have gathered all the above macros to <linux/font.h>. Let us do the same thing for built-in fonts, prepend four extra words (including FONTDATAMAX) to their data buffers, so that subsystems can use these macros for all fonts, no matter built-in or user-provided.
This patch depends on patch "fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h".
--- include/linux/font.h | 5 +++++ lib/fonts/font_10x18.c | 9 ++++----- lib/fonts/font_6x10.c | 9 +++++---- lib/fonts/font_6x11.c | 9 ++++----- lib/fonts/font_7x14.c | 9 ++++----- lib/fonts/font_8x16.c | 9 ++++----- lib/fonts/font_8x8.c | 9 ++++----- lib/fonts/font_acorn_8x8.c | 9 ++++++--- lib/fonts/font_mini_4x6.c | 8 ++++---- lib/fonts/font_pearl_8x8.c | 9 ++++----- lib/fonts/font_sun12x22.c | 9 ++++----- lib/fonts/font_sun8x16.c | 7 ++++--- 12 files changed, 52 insertions(+), 49 deletions(-)
include/linux/font.h +5 -0
@@ -65,4 +65,9 @@ extern const struct font_desc *get_defau#define FONT_EXTRA_WORDS 4 +struct font_data { +unsigned int extra[FONT_EXTRA_WORDS ]; +const unsigned char data[]; +} __packed; +#endif /* _VIDEO_FONT_H */
lib/fonts/font_10x18.c +4 -5
@@ -8,8 +8,8 @@#define FONTDATAMAX 9216 -static const unsigned char fontdata_10x18[FONTDATAMAX ] = { - +static struct font_data fontdata_10x18 = { + {0 ,0 ,FONTDATAMAX ,0 }, {/* 0 0x00 '^@' */ 0x00 ,0x00 ,/* 0000000000 */ 0x00 ,0x00 ,/* 0000000000 */
@@ -5129,8 +5129,7 @@ static const unsigned char fontdata_10x10x00 ,0x00 ,/* 0000000000 */ 0x00 ,0x00 ,/* 0000000000 */ 0x00, 0x00, /* 0000000000 */ - -}; +} }; const struct font_desc font_10x18 = {
@@ -5138,7 +5137,7 @@ const struct font_desc font_10x18 = { .name = "10x18", .width = 10, .height = 18, - .data = fontdata_10x18, + .data = fontdata_10x18.data,#ifdef __sparc__ .pref = 5,#else
lib/fonts/font_6x10.c +5 -4
@@ -1,8 +1,10 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/font.h> -static const unsigned char fontdata_6x10[] = { +#define FONTDATAMAX 2560 +static struct font_data fontdata_6x10 = { + {0 ,0 ,FONTDATAMAX ,0 }, {/* 0 0x00 '^@' */ 0x00 ,/* 00000000 */ 0x00 ,/* 00000000 */
@@ -3074,14 +3076,13 @@ static const unsigned char fontdata_6x10 0x00, /* 00000000 */ 0x00, /* 00000000 */ 0x00, /* 00000000 */ - -}; +} };const struct font_desc font_6x10 = { .idx = FONT6x10_IDX, .name ="6x10" , .width =6 , .height =10 , - .data = fontdata_6x10, + .data = fontdata_6x10.data, .pref =0 , };
lib/fonts/font_6x11.c +4 -5
@@ -9,8 +9,8 @@#define FONTDATAMAX (11*256) -static const unsigned char fontdata_6x11[FONTDATAMAX ] = { - +static struct font_data fontdata_6x11 = { + {0 ,0 ,FONTDATAMAX ,0 }, {/* 0 0x00 '^@' */ 0x00 ,/* 00000000 */ 0x00 ,/* 00000000 */
@@ -3338,8 +3338,7 @@ static const unsigned char fontdata_6x110x00 ,/* 00000000 */ 0x00 ,/* 00000000 */ 0x00, /* 00000000 */ - -}; +} }; const struct font_desc font_vga_6x11 = {
@@ -3347,7 +3346,7 @@ const struct font_desc font_vga_6x11 = { .name = "ProFont6x11", .width = 6, .height = 11, - .data = fontdata_6x11, + .data = fontdata_6x11.data, /* Try avoiding this font if possible unless on MAC */ .pref = -2000, };
lib/fonts/font_7x14.c +4 -5
@@ -8,8 +8,8 @@#define FONTDATAMAX 3584 -static const unsigned char fontdata_7x14[FONTDATAMAX ] = { - +static struct font_data fontdata_7x14 = { + {0 ,0 ,FONTDATAMAX ,0 }, {/* 0 0x00 '^@' */ 0x00 ,/* 0000000 */ 0x00 ,/* 0000000 */
@@ -4105,8 +4105,7 @@ static const unsigned char fontdata_7x140x00 ,/* 0000000 */ 0x00 ,/* 0000000 */ 0x00, /* 0000000 */ - -}; +} }; const struct font_desc font_7x14 = {
@@ -4114,6 +4113,6 @@ const struct font_desc font_7x14 = { .name = "7x14", .width = 7, .height = 14, - .data = fontdata_7x14, + .data = fontdata_7x14.data, .pref = 0, };
lib/fonts/font_8x16.c +4 -5
@@ -10,8 +10,8 @@#define FONTDATAMAX 4096 -static const unsigned char fontdata_8x16[FONTDATAMAX ] = { - +static struct font_data fontdata_8x16 = { + {0 ,0 ,FONTDATAMAX ,0 }, {/* 0 0x00 '^@' */ 0x00 ,/* 00000000 */ 0x00 ,/* 00000000 */
@@ -4619,8 +4619,7 @@ static const unsigned char fontdata_8x160x00 ,/* 00000000 */ 0x00 ,/* 00000000 */ 0x00, /* 00000000 */ - -}; +} }; const struct font_desc font_vga_8x16 = {
@@ -4628,7 +4627,7 @@ const struct font_desc font_vga_8x16 = { .name = "VGA8x16", .width = 8, .height = 16, - .data = fontdata_8x16, + .data = fontdata_8x16.data, .pref = 0, };EXPORT_SYMBOL (font_vga_8x16);
lib/fonts/font_8x8.c +4 -5
@@ -9,8 +9,8 @@#define FONTDATAMAX 2048 -static const unsigned char fontdata_8x8[FONTDATAMAX ] = { - +static struct font_data fontdata_8x8 = { + {0 ,0 ,FONTDATAMAX ,0 }, {/* 0 0x00 '^@' */ 0x00 ,/* 00000000 */ 0x00 ,/* 00000000 */
@@ -2570,8 +2570,7 @@ static const unsigned char fontdata_8x8[0x00 ,/* 00000000 */ 0x00 ,/* 00000000 */ 0x00, /* 00000000 */ - -}; +} }; const struct font_desc font_vga_8x8 = {
@@ -2579,6 +2578,6 @@ const struct font_desc font_vga_8x8 = { .name = "VGA8x8", .width = 8, .height = 8, - .data = fontdata_8x8, + .data = fontdata_8x8.data, .pref = 0, };
lib/fonts/font_acorn_8x8.c +6 -3
@@ -3,7 +3,10 @@#include <linux/font.h> -static const unsigned char acorndata_8x8[] = { +#define FONTDATAMAX 2048 + +static struct font_data acorndata_8x8 = { +{0 ,0 ,FONTDATAMAX ,0 }, {/* 00 */ 0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* ^@ */ /* 01 */ 0x7e ,0x81 ,0xa5 ,0x81 ,0xbd ,0x99 ,0x81 ,0x7e ,/* ^A */ /* 02 */ 0x7e ,0xff ,0xbd ,0xff ,0xc3 ,0xe7 ,0xff ,0x7e ,/* ^B */
@@ -260,14 +263,14 @@ static const unsigned char acorndata_8x8 /* FD */ 0x38, 0x04, 0x18, 0x20, 0x3c, 0x00, 0x00, 0x00, /* FE */ 0x00, 0x00, 0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, /* FF */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; +} };const struct font_desc font_acorn_8x8 = { .idx = ACORN8x8_IDX, .name ="Acorn8x8" , .width =8 , .height =8 , - .data = acorndata_8x8, + .data = acorndata_8x8.data, #ifdef CONFIG_ARCH_ACORN .pref =20 , #else
lib/fonts/font_mini_4x6.c +4 -4
@@ -43,8 +43,8 @@ __END__;#define FONTDATAMAX 1536 -static const unsigned char fontdata_mini_4x6[FONTDATAMAX ] = { - +static struct font_data fontdata_mini_4x6 = { + {0 ,0 ,FONTDATAMAX ,0 }, {/*{*/ /* Char 0: ' ' */ 0xee ,/*= [*** ] */
@@ -2145,14 +2145,14 @@ static const unsigned char fontdata_mini 0xee, /*= [*** ] */ 0x00, /*= [ ] */ /*}*/ -}; +} };const struct font_desc font_mini_4x6 = { .idx = MINI4x6_IDX, .name ="MINI4x6" , .width =4 , .height =6 , - .data = fontdata_mini_4x6, + .data = fontdata_mini_4x6.data, .pref =3 , };
lib/fonts/font_pearl_8x8.c +4 -5
@@ -14,8 +14,8 @@#define FONTDATAMAX 2048 -static const unsigned char fontdata_pearl8x8[FONTDATAMAX ] = { - +static struct font_data fontdata_pearl8x8 = { + {0 ,0 ,FONTDATAMAX ,0 }, {/* 0 0x00 '^@' */ 0x00 ,/* 00000000 */ 0x00 ,/* 00000000 */
@@ -2575,14 +2575,13 @@ static const unsigned char fontdata_pear 0x00, /* 00000000 */ 0x00, /* 00000000 */ 0x00, /* 00000000 */ - -}; +} };const struct font_desc font_pearl_8x8 = { .idx = PEARL8x8_IDX, .name ="PEARL8x8" , .width =8 , .height =8 , - .data = fontdata_pearl8x8, + .data = fontdata_pearl8x8.data, .pref =2 , };
lib/fonts/font_sun12x22.c +4 -5
@@ -3,8 +3,8 @@#define FONTDATAMAX 11264 -static const unsigned char fontdata_sun12x22[FONTDATAMAX ] = { - +static struct font_data fontdata_sun12x22 = { + {0 ,0 ,FONTDATAMAX ,0 }, {/* 0 0x00 '^@' */ 0x00 ,0x00 ,/* 000000000000 */ 0x00 ,0x00 ,/* 000000000000 */
@@ -6148,8 +6148,7 @@ static const unsigned char fontdata_sun10x00 ,0x00 ,/* 000000000000 */ 0x00 ,0x00 ,/* 000000000000 */ 0x00, 0x00, /* 000000000000 */ - -}; +} }; const struct font_desc font_sun_12x22 = {
@@ -6157,7 +6156,7 @@ const struct font_desc font_sun_12x22 = .name = "SUN12x22", .width = 12, .height = 22, - .data = fontdata_sun12x22, + .data = fontdata_sun12x22.data,#ifdef __sparc__ .pref = 5,#else
lib/fonts/font_sun8x16.c +4 -3
@@ -3,7 +3,8 @@#define FONTDATAMAX 4096 -static const unsigned char fontdata_sun8x16[FONTDATAMAX ] = { +static struct font_data fontdata_sun8x16 = { +{0 ,0 ,FONTDATAMAX ,0 }, {/* */ 0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* */ 0x00 ,0x00 ,0x7e ,0x81 ,0xa5 ,0x81 ,0x81 ,0xbd ,0x99 ,0x81 ,0x81 ,0x7e ,0x00 ,0x00 ,0x00 ,0x00 ,/* */ 0x00 ,0x00 ,0x7e ,0xff ,0xdb ,0xff ,0xff ,0xc3 ,0xe7 ,0xff ,0xff ,0x7e ,0x00 ,0x00 ,0x00 ,0x00 ,
@@ -260,14 +261,14 @@ static const unsigned char fontdata_sun8 /* */ 0x00,0x70,0xd8,0x30,0x60,0xc8,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* */ 0x00,0x00,0x00,0x00,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x00,0x00,0x00,0x00,0x00, /* */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -}; +} };const struct font_desc font_sun_8x16 = { .idx = SUN8x16_IDX, .name ="SUN8x16" , .width =8 , .height =16 , - .data = fontdata_sun8x16, + .data = fontdata_sun8x16.data, #ifdef __sparc__ .pref =10 , #else
Greg Kroah-Hartman
maintainerPATCH 32/70 fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
commit bb0890b4cd7f8203e3aa99c6d0f062d6acdaad27 upstream.
drivers/video/console/newport_con.c is borrowing FONT_EXTRA_WORDS macros from drivers/video/fbdev/core/fbcon.h. To keep things simple, move all definitions into <linux/font.h>.
Since newport_con now uses four extra words, initialize the fourth word in newport_set_font() properly.
--- drivers/video/console/newport_con.c | 7 +------ drivers/video/fbdev/core/fbcon.h | 7 ------- drivers/video/fbdev/core/fbcon_rotate.c | 1 + drivers/video/fbdev/core/tileblit.c | 1 + include/linux/font.h | 8 ++++++++ 5 files changed, 11 insertions(+), 13 deletions(-)
drivers/video/console/newport_con.c +1 -6
@@ -35,12 +35,6 @@#define FONT_DATA ((unsigned char *)font_vga_8x16.data) -/* borrowed from fbcon.c */ -#define REFCOUNT (fd) (((int *)(fd))[-1]) -#define FNTSIZE (fd) (((int *)(fd))[-2]) -#define FNTCHARCNT (fd) (((int *)(fd))[-3]) -#define FONT_EXTRA_WORDS 3 -static unsigned char *font_data[MAX_NR_CONSOLES ];static struct newport_regs *npregs;
@@ -522,6 +516,7 @@ static int newport_set_font(int unit, stFNTSIZE (new_data) = size;FNTCHARCNT (new_data) = op->charcount;REFCOUNT (new_data) =0 ;/* usage counter */ +FNTSUM (new_data) =0 ; p = new_data;for (i =0 ; i < op->charcount; i++) {
drivers/video/fbdev/core/fbcon.h +0 -7
@@ -151,13 +151,6 @@ static inline int attr_col_ec(int shift,#define attr_bgcol_ec (bgshift, vc, info) attr_col_ec(bgshift, vc, info, 0)#define attr_fgcol_ec (fgshift, vc, info) attr_col_ec(fgshift, vc, info, 1) -/* Font */ -#define REFCOUNT (fd) (((int *)(fd))[-1]) -#define FNTSIZE (fd) (((int *)(fd))[-2]) -#define FNTCHARCNT (fd) (((int *)(fd))[-3]) -#define FNTSUM (fd) (((int *)(fd))[-4]) -#define FONT_EXTRA_WORDS 4 -/* * Scroll Method */
drivers/video/fbdev/core/fbcon_rotate.c +1 -0
@@ -14,6 +14,7 @@#include <linux/fb.h> #include <linux/vt_kern.h> #include <linux/console.h> +#include <linux/font.h> #include <asm/types.h> #include "fbcon.h" #include "fbcon_rotate.h"
drivers/video/fbdev/core/tileblit.c +1 -0
@@ -13,6 +13,7 @@#include <linux/fb.h> #include <linux/vt_kern.h> #include <linux/console.h> +#include <linux/font.h> #include <asm/types.h> #include "fbcon.h"
include/linux/font.h +8 -0
@@ -57,4 +57,12 @@ extern const struct font_desc *get_defau/* Max. length for the name of a predefined font */ #define MAX_FONT_NAME 32 +/* Extra word getters */ +#define REFCOUNT (fd) (((int *)(fd))[-1]) +#define FNTSIZE (fd) (((int *)(fd))[-2]) +#define FNTCHARCNT (fd) (((int *)(fd))[-3]) +#define FNTSUM (fd) (((int *)(fd))[-4]) + +#define FONT_EXTRA_WORDS 4 +#endif /* _VIDEO_FONT_H */
Greg Kroah-Hartman
maintainerPATCH 34/70 Revert "ravb: Fixed to be able to unload modules"
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit 77972b55fb9d35d4a6b0abca99abffaa4ec6a85b upstream.
This reverts commit 1838d6c62f57836639bd3d83e7855e0ee4f6defc.
This commit moved the ravb_mdio_init() call (and thus the of_mdiobus_register() call) from the ravb_probe() to the ravb_open() call. This causes a regression during system resume (s2idle/s2ram), as new PHY devices cannot be bound while suspended.
During boot, the Micrel PHY is detected like this:
Micrel KSZ9031 Gigabit PHY e6800000.ethernet-ffffffff:00: attached PHY driver [Micrel KSZ9031 Gigabit PHY] (mii_bus:phy_addr=e6800000.ethernet-ffffffff:00, irq=228) ravb e6800000.ethernet eth0: Link is Up - 1Gbps/Full - flow control off
During system suspend, (A) defer_all_probes is set to true, and (B) usermodehelper_disabled is set to UMH_DISABLED, to avoid drivers being probed while suspended.
A. If CONFIG_MODULES=n, phy_device_register() calling device_add()
merely adds the device, but does not probe it yet, as
really_probe() returns early due to defer_all_probes being set:
dpm_resume+0x128/0x4f8
device_resume+0xcc/0x1b0
dpm_run_callback+0x74/0x340
ravb_resume+0x190/0x1b8
ravb_open+0x84/0x770
of_mdiobus_register+0x1e0/0x468
of_mdiobus_register_phy+0x1b8/0x250
of_mdiobus_phy_device_register+0x178/0x1e8
phy_device_register+0x114/0x1b8
device_add+0x3d4/0x798
bus_probe_device+0x98/0xa0
device_initial_probe+0x10/0x18
__device_attach+0xe4/0x140
bus_for_each_drv+0x64/0xc8
__device_attach_driver+0xb8/0xe0
driver_probe_device.part.11+0xc4/0xd8
really_probe+0x32c/0x3b8
Later, phy_attach_direct() notices no PHY driver has been bound,
and falls back to the Generic PHY, leading to degraded operation:
Generic PHY e6800000.ethernet-ffffffff:00: attached PHY driver [Generic PHY] (mii_bus:phy_addr=e6800000.ethernet-ffffffff:00, irq=POLL)
ravb e6800000.ethernet eth0: Link is Up - 1Gbps/Full - flow control off B. If CONFIG_MODULES=y, request_module() returns early with -EBUSY due
to UMH_DISABLED, and MDIO initialization fails completely:
mdio_bus e6800000.ethernet-ffffffff:00: error -16 loading PHY driver module for ID 0x00221622 ravb e6800000.ethernet eth0: failed to initialize MDIO
PM: dpm_run_callback(): ravb_resume+0x0/0x1b8 returns -16
PM: Device e6800000.ethernet failed to resume: error -16
Ignoring -EBUSY in phy_request_driver_module(), like was done for -ENOENT in commit 21e194425abd65b5 ("net: phy: fix issue with loading PHY driver w/o initramfs"), would makes it fall back to the Generic PHY, like in the CONFIG_MODULES=n case.
--- drivers/net/ethernet/renesas/ravb_main.c | 110 +++++++++++++++---------------- 1 file changed, 55 insertions(+), 55 deletions(-)
drivers/net/ethernet/renesas/ravb_main.c +55 -55
@@ -1374,51 +1374,6 @@ static inline int ravb_hook_irq(unsignedreturn error; } -/* MDIO bus init function */ -static int ravb_mdio_init (struct ravb_private *priv) -{ -struct platform_device *pdev = priv->pdev; -struct device *dev = &pdev->dev; -int error; - -/* Bitbang init */ - priv->mdiobb.ops = &bb_ops; - -/* MII controller setting */ - priv->mii_bus =alloc_mdio_bitbang (&priv->mdiobb); -if (!priv->mii_bus) -return -ENOMEM ; - -/* Hook up MII support for ethtool */ - priv->mii_bus->name ="ravb_mii" ; - priv->mii_bus->parent = dev; -snprintf (priv->mii_bus->id,MII_BUS_ID_SIZE ,"%s-%x" , - pdev->name, pdev->id); - -/* Register MDIO bus */ - error =of_mdiobus_register (priv->mii_bus, dev->of_node); -if (error) - goto out_free_bus; - -return 0 ; - -out_free_bus: -free_mdio_bitbang (priv->mii_bus); -return error; -} - -/* MDIO bus release function */ -static int ravb_mdio_release (struct ravb_private *priv) -{ -/* Unregister mdio bus */ -mdiobus_unregister (priv->mii_bus); - -/* Free bitbang info */ -free_mdio_bitbang (priv->mii_bus); - -return 0 ; -} -/* Network device open function for Ethernet AVB */ static int ravb_open (struct net_device *ndev) {
@@ -1427,13 +1382,6 @@ static int ravb_open(struct net_device *struct device *dev = &pdev->dev;int error; -/* MDIO bus init */ - error =ravb_mdio_init (priv); -if (error) { -netdev_err (ndev,"failed to initialize MDIO\n" ); -return error; - } -napi_enable (&priv->napi[RAVB_BE ]);napi_enable (&priv->napi[RAVB_NC ]);
@@ -1511,7 +1459,6 @@ out_free_irq: out_napi_off:napi_disable (&priv->napi[RAVB_NC ]);napi_disable (&priv->napi[RAVB_BE ]); -ravb_mdio_release (priv);return error; }
@@ -1810,8 +1757,6 @@ static int ravb_close(struct net_deviceravb_ring_free (ndev,RAVB_BE );ravb_ring_free (ndev,RAVB_NC ); -ravb_mdio_release (priv); -return 0 ; }
@@ -1913,6 +1858,51 @@ static const struct net_device_ops ravb_ .ndo_set_mac_address = eth_mac_addr, }; +/* MDIO bus init function */ +static int ravb_mdio_init (struct ravb_private *priv) +{ +struct platform_device *pdev = priv->pdev; +struct device *dev = &pdev->dev; +int error; + +/* Bitbang init */ + priv->mdiobb.ops = &bb_ops; + +/* MII controller setting */ + priv->mii_bus =alloc_mdio_bitbang (&priv->mdiobb); +if (!priv->mii_bus) +return -ENOMEM ; + +/* Hook up MII support for ethtool */ + priv->mii_bus->name ="ravb_mii" ; + priv->mii_bus->parent = dev; +snprintf (priv->mii_bus->id,MII_BUS_ID_SIZE ,"%s-%x" , + pdev->name, pdev->id); + +/* Register MDIO bus */ + error =of_mdiobus_register (priv->mii_bus, dev->of_node); +if (error) + goto out_free_bus; + +return 0 ; + +out_free_bus: +free_mdio_bitbang (priv->mii_bus); +return error; +} + +/* MDIO bus release function */ +static int ravb_mdio_release (struct ravb_private *priv) +{ +/* Unregister mdio bus */ +mdiobus_unregister (priv->mii_bus); + +/* Free bitbang info */ +free_mdio_bitbang (priv->mii_bus); + +return 0 ; +} +static const struct of_device_id ravb_match_table[] = { { .compatible ="renesas,etheravb-r8a7790" , .data = (void *)RCAR_GEN2 }, { .compatible ="renesas,etheravb-r8a7794" , .data = (void *)RCAR_GEN2 },
@@ -2142,6 +2132,13 @@ static int ravb_probe(struct platform_deeth_hw_addr_random (ndev); } +/* MDIO bus init */ + error =ravb_mdio_init (priv); +if (error) { +dev_err (&pdev->dev,"failed to initialize MDIO\n" ); + goto out_dma_free; + } +netif_napi_add (ndev, &priv->napi[RAVB_BE ], ravb_poll,64 );netif_napi_add (ndev, &priv->napi[RAVB_NC ], ravb_poll,64 );
@@ -2164,6 +2161,8 @@ static int ravb_probe(struct platform_de out_napi_del:netif_napi_del (&priv->napi[RAVB_NC ]);netif_napi_del (&priv->napi[RAVB_BE ]); +ravb_mdio_release (priv); +out_dma_free:dma_free_coherent (ndev->dev.parent, priv->desc_bat_size, priv->desc_bat, priv->desc_bat_dma);
@@ -2196,6 +2195,7 @@ static int ravb_remove(struct platform_dunregister_netdev (ndev);netif_napi_del (&priv->napi[RAVB_NC ]);netif_napi_del (&priv->napi[RAVB_BE ]); +ravb_mdio_release (priv);pm_runtime_disable (&pdev->dev);free_netdev (ndev);platform_set_drvdata (pdev,NULL );
Greg Kroah-Hartman
maintainerPATCH 31/70 drm/syncobj: Fix drm_syncobj_handle_to_fd refcount leak
In reply to Greg Kroah-HartmanFrom: Giuliano Procida <[email protected]>
Commit 5fb252cad61f20ae5d5a8b199f6cc4faf6f418e1, a cherry-pick of upstream commit e7cdf5c82f1773c3386b93bbcf13b9bfff29fa31, introduced a refcount imbalance and thus a struct drm_syncobj object leak which can be triggered with DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD.
The function drm_syncobj_handle_to_fd first calls drm_syncobj_find which increments the refcount of the object on success. In all of the drm_syncobj_handle_to_fd error paths, the refcount is decremented, but in the success path the refcount should remain at +1 as the struct drm_syncobj now belongs to the newly opened file. Instead, the refcount was incremented again to +2.
--- drivers/gpu/drm/drm_syncobj.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/drm_syncobj.c +0 -1
@@ -355,7 +355,6 @@ static int drm_syncobj_handle_to_fd(strureturn PTR_ERR (file); } -drm_syncobj_get (syncobj);fd_install (fd, file); *p_fd = fd;
Greg Kroah-Hartman
maintainerPATCH 30/70 netfilter: ctnetlink: add a range check for l3/l4 protonum
In reply to Greg Kroah-HartmanFrom: Will McVicker <[email protected]>
commit 1cc5ef91d2ff94d2bf2de3b3585423e8a1051cb6 upstream.
The indexes to the nf_nat_l[34]protos arrays come from userspace. So check the tuple's family, e.g. l3num, when creating the conntrack in order to prevent an OOB memory access during setup. Here is an example kernel panic on 4.14.180 when userspace passes in an index greater than NFPROTO_NUMPROTO.
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP Modules linked in:... Process poc (pid: 5614, stack limit = 0x00000000a3933121) CPU: 4 PID: 5614 Comm: poc Tainted: G S W O 4.14.180-g051355490483 Hardware name: Qualcomm Technologies, Inc. SM8150 V2 PM8150 Google Inc. MSM task: 000000002a3dfffe task.stack: 00000000a3933121 pc : __cfi_check_fail+0x1c/0x24 lr : __cfi_check_fail+0x1c/0x24 ... Call trace: __cfi_check_fail+0x1c/0x24 name_to_dev_t+0x0/0x468 nfnetlink_parse_nat_setup+0x234/0x258 ctnetlink_parse_nat_setup+0x4c/0x228 ctnetlink_new_conntrack+0x590/0xc40 nfnetlink_rcv_msg+0x31c/0x4d4 netlink_rcv_skb+0x100/0x184 nfnetlink_rcv+0xf4/0x180 netlink_unicast+0x360/0x770 netlink_sendmsg+0x5a0/0x6a4 ___sys_sendmsg+0x314/0x46c SyS_sendmsg+0xb4/0x108 el0_svc_naked+0x34/0x38
This crash is not happening since 5.4+, however, ctnetlink still allows for creating entries with unsupported layer 3 protocol number.
--- net/netfilter/nf_conntrack_netlink.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nf_conntrack_netlink.c +2 -0
@@ -1043,6 +1043,8 @@ ctnetlink_parse_tuple(const struct nlattif (!tb[CTA_TUPLE_IP ])return -EINVAL ; +if (l3num !=NFPROTO_IPV4 && l3num !=NFPROTO_IPV6 ) +return -EOPNOTSUPP ; tuple->src.l3num = l3num; err =ctnetlink_parse_tuple_ip (tb[CTA_TUPLE_IP ], tuple);
Greg Kroah-Hartman
maintainerPATCH 29/70 ep_create_wakeup_source(): dentry name can change under you...
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit 3701cb59d892b88d569427586f01491552f377b1 upstream.
or get freed, for that matter, if it's a long (separately stored) name.
--- fs/eventpoll.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/eventpoll.c +4 -3
@@ -1389,7 +1389,7 @@ static int reverse_path_check(void)static int ep_create_wakeup_source (struct epitem *epi) { -const char *name; +struct name_snapshot n;struct wakeup_source *ws;if (!epi->ep->ws) {
@@ -1398,8 +1398,9 @@ static int ep_create_wakeup_source(strucreturn -ENOMEM ; } - name = epi->ffd.file->f_path.dentry->d_name.name; - ws =wakeup_source_register (name); +take_dentry_name_snapshot (&n, epi->ffd.file->f_path.dentry); + ws =wakeup_source_register (n.name); +release_dentry_name_snapshot (&n);if (!ws)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 25/70 net/packet: fix overflow in tpacket_rcv
In reply to Greg Kroah-HartmanFrom: Or Cohen <[email protected]>
commit acf69c946233259ab4d64f8869d4037a198c7f06 upstream.
Using tp_reserve to calculate netoff can overflow as tp_reserve is unsigned int and netoff is unsigned short.
This may lead to macoff receving a smaller value then sizeof(struct virtio_net_hdr), and if po->has_vnet_hdr is set, an out-of-bounds write will occur when calling virtio_net_hdr_from_skb.
The bug is fixed by converting netoff to unsigned int and checking if it exceeds USHRT_MAX.
This addresses CVE-2020-14386
--- net/packet/af_packet.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/packet/af_packet.c +8 -1
@@ -2201,7 +2201,8 @@ static int tpacket_rcv(struct sk_buff *sint skb_len = skb->len;unsigned int snaplen, res;unsigned long status =TP_STATUS_USER ; -unsigned short macoff, netoff, hdrlen; +unsigned short macoff, hdrlen; +unsigned int netoff;struct sk_buff *copy_skb =NULL ;struct timespec ts;__u32 ts_status;
@@ -2264,6 +2265,12 @@ static int tpacket_rcv(struct sk_buff *s } macoff = netoff - maclen; } +if (netoff >USHRT_MAX ) { +spin_lock (&sk->sk_receive_queue.lock); + po->stats.stats1.tp_drops++; +spin_unlock (&sk->sk_receive_queue.lock); + goto drop_n_restore; + }if (po->tp_version <=TPACKET_V2 ) {if (macoff + snaplen > po->rx_ring.frame_size) { if (po->copy_thresh &&
Greg Kroah-Hartman
maintainercover 4.14.201-rc1 review
This is the start of the stable review cycle for the 4.14.201 release. There are 70 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 14 Oct 2020 13:26:14 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.201-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.14.201-rc1
Anant Thazhemadam <[email protected]>
net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails
Vijay Balakrishna <[email protected]>
mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged
Coly Li <[email protected]>
mmc: core: don't set limits.discard_granularity as 0
Kajol Jain <[email protected]>
perf: Fix task_function_call() error handling
David Howells <[email protected]>
rxrpc: Fix server keyring leak
David Howells <[email protected]>
rxrpc: Fix some missing _bh annotations on locking conn->state_lock
David Howells <[email protected]>
rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read()
Marc Dionne <[email protected]>
rxrpc: Fix rxkad token xdr encoding
Wilken Gottwalt <[email protected]>
net: usb: ax88179_178a: fix missing stop entry in driver_info
Randy Dunlap <[email protected]>
mdio: fix mdio-thunder.c dependency & build error
Eric Dumazet <[email protected]>
bonding: set dev->needed_headroom in bond_setup_by_slave()
Herbert Xu <[email protected]>
xfrm: Use correct address family in xfrm_state_find
Necip Fazil Yildiran <[email protected]>
platform/x86: fix kconfig dependency warning for FUJITSU_LAPTOP
Voon Weifeng <[email protected]>
net: stmmac: removed enabling eee in EEE set callback
Antony Antony <[email protected]>
xfrm: clone whole liftime_cur structure in xfrm_do_migrate
Antony Antony <[email protected]>
xfrm: clone XFRMA_SEC_CTX in xfrm_do_migrate
Antony Antony <[email protected]>
xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate
Philip Yang <[email protected]>
drm/amdgpu: prevent double kfree ttm->sg
Dumitru Ceara <[email protected]>
openvswitch: handle DNAT tuple collision
Anant Thazhemadam <[email protected]>
net: team: fix memory leak in __team_options_register
Eric Dumazet <[email protected]>
team: set dev->needed_headroom in team_setup_by_port()
Eric Dumazet <[email protected]>
sctp: fix sctp_auth_init_hmacs() error path
Jerome Brunet <[email protected]>
i2c: meson: fix clock setting overwrite
Vladimir Zapolskiy <[email protected]>
cifs: Fix incomplete memory allocation on setxattr path
Hugh Dickins <[email protected]>
mm/khugepaged: fix filemap page_to_pgoff(page) != offset
Eric Dumazet <[email protected]>
macsec: avoid use-after-free in macsec_handle_frame()
Steven Rostedt (VMware) <[email protected]>
ftrace: Move RCU is watching check after recursion check
Robbie Ko <[email protected]>
Btrfs: fix unexpected failure of nocow buffered writes after snapshotting when low on space
Miquel Raynal <[email protected]>
mtd: rawnand: sunxi: Fix the probe error path
Tommi Rantala <[email protected]>
perf top: Fix stdio interface input handling with glibc 2.28+
Tetsuo Handa <[email protected]>
driver core: Fix probe_count imbalance in really_probe()
Aaron Ma <[email protected]>
platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse
Tom Rix <[email protected]>
platform/x86: thinkpad_acpi: initialize tp_nvram_state variable
Linus Torvalds <[email protected]>
usermodehelper: reset umask to default before executing user process
Anant Thazhemadam <[email protected]>
net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key()
Peilin Ye <[email protected]>
fbcon: Fix global-out-of-bounds read in fbcon_get_font()
Geert Uytterhoeven <[email protected]>
Revert "ravb: Fixed to be able to unload modules"
Peilin Ye <[email protected]>
Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts
Peilin Ye <[email protected]>
fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h
Giuliano Procida <[email protected]>
drm/syncobj: Fix drm_syncobj_handle_to_fd refcount leak
Will McVicker <[email protected]>
netfilter: ctnetlink: add a range check for l3/l4 protonum
Al Viro <[email protected]>
ep_create_wakeup_source(): dentry name can change under you...
Al Viro <[email protected]>
epoll: EPOLL_CTL_ADD: close the race in decision to take fast path
Al Viro <[email protected]>
epoll: replace ->visited/visited_list with generation count
Al Viro <[email protected]>
epoll: do not insert into poll queues until all sanity checks are done
Or Cohen <[email protected]>
net/packet: fix overflow in tpacket_rcv
Thibaut Sautereau <[email protected]>
random32: Restore __latent_entropy attribute on net_rand_state
Vincent Huang <[email protected]>
Input: trackpoint - enable Synaptics trackpoints
Nicolas VINCENT <[email protected]>
i2c: cpm: Fix i2c_ram structure
Yu Kuai <[email protected]>
iommu/exynos: add missing put_device() call in exynos_iommu_of_xlate()
Marek Szyprowski <[email protected]>
clk: samsung: exynos4: mark 'chipid' clock as CLK_IGNORE_UNUSED
Jeffrey Mitchell <[email protected]>
nfs: Fix security label length not being reset
Chris Packham <[email protected]>
pinctrl: mvebu: Fix i2c sda definition for 98DX3236
James Smart <[email protected]>
nvme-fc: fail new connections to a deleted host or remote port
Chris Packham <[email protected]>
spi: fsl-espi: Only process interrupts for expected events
Felix Fietkau <[email protected]>
mac80211: do not allow bigger VHT MPDUs than the hardware supports
Xie He <[email protected]>
drivers/net/wan/hdlc: Set skb->protocol before transmitting
Xie He <[email protected]>
drivers/net/wan/lapbether: Make skb->protocol consistent with the header
Olympia Giannou <[email protected]>
rndis_host: increase sleep time in the query-response loop
Lucy Yan <[email protected]>
net: dec: de2104x: Increase receive ring size for Tulip
Martin Cerveny <[email protected]>
drm/sun4i: mixer: Extend regmap max_register
Xie He <[email protected]>
drivers/net/wan/hdlc_fr: Add needed_headroom for PVC devices
Jean Delvare <[email protected]>
drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config
Jiri Kosina <[email protected]>
Input: i8042 - add nopnp quirk for Acer Aspire 5 A515
dillon min <[email protected]>
gpio: tc35894: fix up tc35894 interrupt configuration
Bryan O'Donoghue <[email protected]>
USB: gadget: f_ncm: Fix NDP16 datagram validation
Sebastien Boeuf <[email protected]>
net: virtio_vsock: Enhance connection semantics
Stefano Garzarella <[email protected]>
vsock/virtio: add transport parameter to the virtio_transport_reset_no_sock()
Stefano Garzarella <[email protected]>
vsock/virtio: stop workers during the .remove()
Stefano Garzarella <[email protected]>
vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock
-------------
Diffstat:
Makefile | 4 +- drivers/base/dd.c | 5 +- drivers/clk/samsung/clk-exynos4.c | 4 +- drivers/gpio/gpio-tc3589x.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + drivers/gpu/drm/drm_syncobj.c | 1 - drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- drivers/i2c/busses/i2c-cpm.c | 3 + drivers/i2c/busses/i2c-meson.c | 19 +- drivers/input/mouse/trackpoint.c | 2 + drivers/input/serio/i8042-x86ia64io.h | 7 + drivers/iommu/exynos-iommu.c | 8 +- drivers/mmc/core/queue.c | 2 +- drivers/mtd/nand/sunxi_nand.c | 2 +- drivers/net/bonding/bond_main.c | 1 + drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 110 ++++----- .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 15 +- drivers/net/macsec.c | 4 +- drivers/net/phy/Kconfig | 1 + drivers/net/team/team.c | 3 +- drivers/net/usb/ax88179_178a.c | 1 + drivers/net/usb/rndis_host.c | 2 +- drivers/net/usb/rtl8150.c | 16 +- drivers/net/wan/hdlc_cisco.c | 1 + drivers/net/wan/hdlc_fr.c | 6 +- drivers/net/wan/hdlc_ppp.c | 1 + drivers/net/wan/lapbether.c | 4 +- drivers/nvme/host/fc.c | 6 +- drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 2 +- drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/thinkpad_acpi.c | 6 +- drivers/spi/spi-fsl-espi.c | 5 +- drivers/usb/gadget/function/f_ncm.c | 30 +-- drivers/vhost/vsock.c | 94 ++++---- drivers/video/console/newport_con.c | 7 +- drivers/video/fbdev/core/fbcon.c | 12 + drivers/video/fbdev/core/fbcon.h | 7 - drivers/video/fbdev/core/fbcon_rotate.c | 1 + drivers/video/fbdev/core/tileblit.c | 1 + fs/btrfs/ctree.h | 1 + fs/btrfs/disk-io.c | 1 + fs/btrfs/inode.c | 25 +- fs/btrfs/ioctl.c | 16 ++ fs/cifs/smb2ops.c | 2 +- fs/eventpoll.c | 71 +++--- fs/nfs/dir.c | 3 + include/linux/font.h | 13 + include/linux/khugepaged.h | 5 + include/linux/virtio_vsock.h | 3 +- include/net/xfrm.h | 16 +- kernel/events/core.c | 5 +- kernel/trace/ftrace.c | 8 +- kernel/umh.c | 9 + lib/fonts/font_10x18.c | 9 +- lib/fonts/font_6x10.c | 9 +- lib/fonts/font_6x11.c | 9 +- lib/fonts/font_7x14.c | 9 +- lib/fonts/font_8x16.c | 9 +- lib/fonts/font_8x8.c | 9 +- lib/fonts/font_acorn_8x8.c | 9 +- lib/fonts/font_mini_4x6.c | 8 +- lib/fonts/font_pearl_8x8.c | 9 +- lib/fonts/font_sun12x22.c | 9 +- lib/fonts/font_sun8x16.c | 7 +- lib/random32.c | 2 +- mm/khugepaged.c | 25 +- mm/page_alloc.c | 3 + net/mac80211/vht.c | 8 +- net/netfilter/nf_conntrack_netlink.c | 2 + net/openvswitch/conntrack.c | 22 +- net/packet/af_packet.c | 9 +- net/rxrpc/conn_event.c | 6 +- net/rxrpc/key.c | 18 +- net/sctp/auth.c | 1 + net/vmw_vsock/virtio_transport.c | 265 +++++++++++++-------- net/vmw_vsock/virtio_transport_common.c | 13 +- net/wireless/nl80211.c | 3 + net/xfrm/xfrm_state.c | 41 +++- tools/perf/builtin-top.c | 4 +- 81 files changed, 648 insertions(+), 451 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 16/70 spi: fsl-espi: Only process interrupts for expected events
From: Chris Packham <[email protected]>
[ Upstream commit b867eef4cf548cd9541225aadcdcee644669b9e1 ]
The SPIE register contains counts for the TX FIFO so any time the irq handler was invoked we would attempt to process the RX/TX fifos. Use the SPIM value to mask the events so that we only process interrupts that were expected.
This was a latent issue exposed by commit 3282a3da25bd ("powerpc/64:
Implement soft interrupt replay in C").
--- drivers/spi/spi-fsl-espi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/spi/spi-fsl-espi.c +3 -2
@@ -556,13 +556,14 @@ static void fsl_espi_cpu_irq(struct fsl_espi *espi, u32 events)static irqreturn_t fsl_espi_irq (s32 irq,void *context_data) {struct fsl_espi *espi = context_data; -u32 events; +u32 events, mask;spin_lock (&espi->lock);/* Get interrupt events(tx/rx) */ events =fsl_espi_read_reg (espi,ESPI_SPIE ); -if (!events) { + mask =fsl_espi_read_reg (espi,ESPI_SPIM ); +if (!(events & mask)) {spin_unlock (&espi->lock);return IRQ_NONE ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 26/70 epoll: do not insert into poll queues until all sanity checks are done
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit f8d4f44df056c5b504b0d49683fb7279218fd207 upstream.
--- fs/eventpoll.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-)
fs/eventpoll.c +18 -19
@@ -1461,6 +1461,22 @@ static int ep_insert(struct eventpoll *eRCU_INIT_POINTER (epi->ws,NULL ); } +/* Add the current item to the list of active epoll hook for this file */ +spin_lock (&tfile->f_lock); +list_add_tail_rcu (&epi->fllink, &tfile->f_ep_links); +spin_unlock (&tfile->f_lock); + +/* +* Add the current item to the RB tree. All RB tree operations are +* protected by "mtx", and ep_insert() is called with "mtx" held. +*/ +ep_rbtree_insert (ep, epi); + +/* now check if we've created too many backpaths */ + error = -EINVAL ; +if (full_check &&reverse_path_check ()) + goto error_remove_epi; +/* Initialize the poll table using the queue callback */ epq.epi = epi;init_poll_funcptr (&epq.pt, ep_ptable_queue_proc);
@@ -1483,22 +1499,6 @@ static int ep_insert(struct eventpoll *eif (epi->nwait <0 ) goto error_unregister; -/* Add the current item to the list of active epoll hook for this file */ -spin_lock (&tfile->f_lock); -list_add_tail_rcu (&epi->fllink, &tfile->f_ep_links); -spin_unlock (&tfile->f_lock); - -/* -* Add the current item to the RB tree. All RB tree operations are -* protected by "mtx", and ep_insert() is called with "mtx" held. -*/ -ep_rbtree_insert (ep, epi); - -/* now check if we've created too many backpaths */ - error = -EINVAL ; -if (full_check &&reverse_path_check ()) - goto error_remove_epi; -/* We have to drop the new item inside our item list to keep track of it */ spin_lock_irqsave (&ep->lock, flags);
@@ -1527,6 +1527,8 @@ static int ep_insert(struct eventpoll *ereturn 0 ; +error_unregister: +ep_unregister_pollwait (ep, epi); error_remove_epi:spin_lock (&tfile->f_lock);list_del_rcu (&epi->fllink);
@@ -1534,9 +1536,6 @@ error_remove_epi:rb_erase_cached (&epi->rbn, &ep->rbr); -error_unregister: -ep_unregister_pollwait (ep, epi); -/* * We need to do this because an event could have been arrived on some * allocated wait queue. Note that we don't care about the ep->ovflist
Greg Kroah-Hartman
maintainerPATCH 8/70 drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config
In reply to Greg Kroah-HartmanFrom: Jean Delvare <[email protected]>
commit a39d0d7bdf8c21ac7645c02e9676b5cb2b804c31 upstream.
A recent attempt to fix a ref count leak in amdgpu_display_crtc_set_config() turned out to be doing too much and "fixed" an intended decrease as if it were a leak. Undo that part to restore the proper balance. This is the very nature of this function to increase or decrease the power reference count depending on the situation.
Consequences of this bug is that the power reference would eventually get down to 0 while the display was still in use, resulting in that display switching off unexpectedly.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +1 -1
@@ -284,7 +284,7 @@ int amdgpu_crtc_set_config(struct drm_motake the current one */ if (active && !adev->have_disp_power_ref) { adev->have_disp_power_ref = true; - goto out; +return ret; }/* if we have no active crtcs, then drop the power ref we got before */
Greg Kroah-Hartman
maintainerPATCH 7/70 Input: i8042 - add nopnp quirk for Acer Aspire 5 A515
In reply to Greg Kroah-HartmanFrom: Jiri Kosina <[email protected]>
commit 5fc27b098dafb8e30794a9db0705074c7d766179 upstream.
Touchpad on this laptop is not detected properly during boot, as PNP enumerates (wrongly) AUX port as disabled on this machine.
Fix that by adding this board (with admittedly quite funny DMI identifiers) to nopnp quirk list.
--- drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -725,6 +725,13 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), }, }, + { + /* Acer Aspire 5 A515 */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "Grumpy_PK"), + DMI_MATCH(DMI_BOARD_VENDOR, "PK"), + }, + }, { } };
Greg Kroah-Hartman
maintainerPATCH 6/70 gpio: tc35894: fix up tc35894 interrupt configuration
In reply to Greg Kroah-HartmanFrom: dillon min <[email protected]>
commit 214b0e1ad01abf4c1f6d8d28fa096bf167e47cef upstream.
The offset of regmap is incorrect, j * 8 is move to the wrong register.
for example:
asume i = 0, j = 1. we want to set KPY5 as interrupt falling edge mode, regmap[0][1] should be TC3589x_GPIOIBE1 0xcd but, regmap[i] + j * 8 = TC3589x_GPIOIBE0 + 8 ,point to 0xd4, this is TC3589x_GPIOIE2 not TC3589x_GPIOIBE1.
--- drivers/gpio/gpio-tc3589x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-tc3589x.c +1 -1
@@ -209,7 +209,7 @@ static void tc3589x_gpio_irq_sync_unlockcontinue ; tc3589x_gpio->oldregs[i][j] = new; -tc3589x_reg_write (tc3589x, regmap[i] + j *8 , new); +tc3589x_reg_write (tc3589x, regmap[i] + j, new); } }
Greg Kroah-Hartman
maintainerPATCH 5/70 USB: gadget: f_ncm: Fix NDP16 datagram validation
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
commit 2b405533c2560d7878199c57d95a39151351df72 upstream.
commit 2b74b0a04d3e ("USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb()") adds important bounds checking however it unfortunately also introduces a bug with respect to section 3.3.1 of the NCM specification.
wDatagramIndex[1] : "Byte index, in little endian, of the second datagram described by this NDP16. If zero, then this marks the end of the sequence of datagrams in this NDP16."
wDatagramLength[1]: "Byte length, in little endian, of the second datagram described by this NDP16. If zero, then this marks the end of the sequence of datagrams in this NDP16."
wDatagramIndex[1] and wDatagramLength[1] respectively then may be zero but that does not mean we should throw away the data referenced by wDatagramIndex[0] and wDatagramLength[0] as is currently the case.
Breaking the loop on (index2 == 0 || dg_len2 == 0) should come at the end as was previously the case and checks for index2 and dg_len2 should be removed since zero is valid.
I'm not sure how much testing the above patch received but for me right now after enumeration ping doesn't work. Reverting the commit restores ping, scp, etc.
The extra validation associated with wDatagramIndex[0] and wDatagramLength[0] appears to be valid so, this change removes the incorrect restriction on wDatagramIndex[1] and wDatagramLength[1] restoring data processing between host and device.
--- drivers/usb/gadget/function/f_ncm.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-)
drivers/usb/gadget/function/f_ncm.c +2 -28
@@ -1210,7 +1210,6 @@ static int ncm_unwrap_ntb(struct getherconst struct ndp_parser_opts *opts = ncm->parser_opts;unsigned crc_len = ncm->is_crc ?sizeof (uint32_t ) :0 ;int dgram_counter; -bool ndp_after_header;/* dwSignature */ if (get_unaligned_le32 (tmp) != opts->nth_sign) {
@@ -1237,7 +1236,6 @@ static int ncm_unwrap_ntb(struct gether } ndp_index =get_ncm (&tmp, opts->ndp_index); - ndp_after_header = false;/* Run through all the NDP's in the NTB */ do {
@@ -1253,8 +1251,6 @@ static int ncm_unwrap_ntb(struct gether ndp_index); goto err; } -if (ndp_index == opts->nth_size) - ndp_after_header = true;/* * walk through NDP
@@ -1333,37 +1329,13 @@ static int ncm_unwrap_ntb(struct gether index2 =get_ncm (&tmp, opts->dgram_item_len); dg_len2 =get_ncm (&tmp, opts->dgram_item_len); -if (index2 ==0 || dg_len2 ==0 ) -break ; -/* wDatagramIndex[1] */ -if (ndp_after_header) { -if (index2 < opts->nth_size + opts->ndp_size) { -INFO (port->func.config->cdev, -"Bad index: %#X\n" , index2); - goto err; - } - }else { -if (index2 < opts->nth_size + opts->dpe_size) { -INFO (port->func.config->cdev, -"Bad index: %#X\n" , index2); - goto err; - } - }if (index2 > block_len - opts->dpe_size) {INFO (port->func.config->cdev,"Bad index: %#X\n" , index2); goto err; } -/* wDatagramLength[1] */ -if ((dg_len2 <14 + crc_len) || - (dg_len2 > frame_max)) { -INFO (port->func.config->cdev, -"Bad dgram length: %#X\n" , dg_len); - goto err; - } -/* * Copy the data into a new skb. * This ensures the truesize is correct
@@ -1380,6 +1352,8 @@ static int ncm_unwrap_ntb(struct gether ndp_len -=2 * (opts->dgram_item_len *2 ); dgram_counter++; +if (index2 ==0 || dg_len2 ==0 ) +break ; }while (ndp_len >2 * (opts->dgram_item_len *2 )); }while (ndp_index);
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.201 release. There are 70 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 14 Oct 2020 13:26:14 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.201-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v4.14:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
30 tests: 30 pass, 0 failLinux version: 4.14.201-rc1-gaf37e8ff299b
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04
Jon
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.201 release. There are 70 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 14 Oct 2020 13:26:14 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.201-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.14.201-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.14.y
git commit: af37e8ff299b6807fa85fde68b814a94f56a76b6
git describe: v4.14.200-71-gaf37e8ff299b
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-4.14.y/build/v4.14.200-71-gaf37e8ff299b
No regressions (compared to build v4.14.200)
No fixes (compared to build v4.14.200)
Ran 33137 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- juno-r2-compat
- juno-r2-kasan
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
- x86-kasan
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kvm-unit-tests
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-syscalls-tests
* ltp-fs-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* perf
* v4l2-compliance
* ltp-open-posix-tests
* ltp-tracing-tests
* network-basic-tests
* ssuite
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.201 release. There are 70 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 14 Oct 2020 13:26:14 +0000. Anything received after that time might be too late.
Build results:
total: 168 pass: 168 fail: 0 Qemu test results: total: 408 pass: 408 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.14.201 release. There are 70 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 14 Oct 2020 13:26:14 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.201-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.14.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah