commit: 1d996290ed3f1ffdc4ea2d9b4c4d2cf19ccc77d3 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Thu Aug 27 13:22:06 2020 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Thu Aug 27 13:22:06 2020 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=1d996290
Linux patch 5.8.5 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 4 + 1004_linux-5.8.5.patch | 397 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 401 insertions(+) diff --git a/0000_README b/0000_README index 17d6b16..4ed3bb4 100644 --- a/0000_README +++ b/0000_README @@ -59,6 +59,10 @@ Patch: 1003_linux-5.8.4.patch From: http://www.kernel.org Desc: Linux 5.8.4 +Patch: 1004_linux-5.8.5.patch +From: http://www.kernel.org +Desc: Linux 5.8.5 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1004_linux-5.8.5.patch b/1004_linux-5.8.5.patch new file mode 100644 index 0000000..68d90ad --- /dev/null +++ b/1004_linux-5.8.5.patch @@ -0,0 +1,397 @@ +diff --git a/Makefile b/Makefile +index 9a7a416f2d84e..f47073a3b4740 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 5 + PATCHLEVEL = 8 +-SUBLEVEL = 4 ++SUBLEVEL = 5 + EXTRAVERSION = + NAME = Kleptomaniac Octopus + +diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c +index 000f57198352d..9f2c697ba0ac8 100644 +--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c ++++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c +@@ -3609,7 +3609,7 @@ static int check_missing_comp_in_tx_queue(struct ena_adapter *adapter, + } + + u64_stats_update_begin(&tx_ring->syncp); +- tx_ring->tx_stats.missed_tx = missed_tx; ++ tx_ring->tx_stats.missed_tx += missed_tx; + u64_stats_update_end(&tx_ring->syncp); + + return rc; +@@ -4537,6 +4537,9 @@ static void ena_keep_alive_wd(void *adapter_data, + tx_drops = ((u64)desc->tx_drops_high << 32) | desc->tx_drops_low; + + u64_stats_update_begin(&adapter->syncp); ++ /* These stats are accumulated by the device, so the counters indicate ++ * all drops since last reset. ++ */ + adapter->dev_stats.rx_drops = rx_drops; + adapter->dev_stats.tx_drops = tx_drops; + u64_stats_update_end(&adapter->syncp); +diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c +index f2f9086ebe983..b9c658e0548eb 100644 +--- a/fs/binfmt_flat.c ++++ b/fs/binfmt_flat.c +@@ -576,7 +576,7 @@ static int load_flat_file(struct linux_binprm *bprm, + goto err; + } + +- len = data_len + extra; ++ len = data_len + extra + MAX_SHARED_LIBS * sizeof(unsigned long); + len = PAGE_ALIGN(len); + realdatastart = vm_mmap(NULL, 0, len, + PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, 0); +@@ -590,7 +590,9 @@ static int load_flat_file(struct linux_binprm *bprm, + vm_munmap(textpos, text_len); + goto err; + } +- datapos = ALIGN(realdatastart, FLAT_DATA_ALIGN); ++ datapos = ALIGN(realdatastart + ++ MAX_SHARED_LIBS * sizeof(unsigned long), ++ FLAT_DATA_ALIGN); + + pr_debug("Allocated data+bss+stack (%u bytes): %lx\n", + data_len + bss_len + stack_len, datapos); +@@ -620,7 +622,7 @@ static int load_flat_file(struct linux_binprm *bprm, + memp_size = len; + } else { + +- len = text_len + data_len + extra; ++ len = text_len + data_len + extra + MAX_SHARED_LIBS * sizeof(u32); + len = PAGE_ALIGN(len); + textpos = vm_mmap(NULL, 0, len, + PROT_READ | PROT_EXEC | PROT_WRITE, MAP_PRIVATE, 0); +@@ -635,7 +637,9 @@ static int load_flat_file(struct linux_binprm *bprm, + } + + realdatastart = textpos + ntohl(hdr->data_start); +- datapos = ALIGN(realdatastart, FLAT_DATA_ALIGN); ++ datapos = ALIGN(realdatastart + ++ MAX_SHARED_LIBS * sizeof(u32), ++ FLAT_DATA_ALIGN); + + reloc = (__be32 __user *) + (datapos + (ntohl(hdr->reloc_start) - text_len)); +@@ -652,9 +656,8 @@ static int load_flat_file(struct linux_binprm *bprm, + (text_len + full_data + - sizeof(struct flat_hdr)), + 0); +- if (datapos != realdatastart) +- memmove((void *)datapos, (void *)realdatastart, +- full_data); ++ memmove((void *) datapos, (void *) realdatastart, ++ full_data); + #else + /* + * This is used on MMU systems mainly for testing. +@@ -710,7 +713,8 @@ static int load_flat_file(struct linux_binprm *bprm, + if (IS_ERR_VALUE(result)) { + ret = result; + pr_err("Unable to read code+data+bss, errno %d\n", ret); +- vm_munmap(textpos, text_len + data_len + extra); ++ vm_munmap(textpos, text_len + data_len + extra + ++ MAX_SHARED_LIBS * sizeof(u32)); + goto err; + } + } +diff --git a/fs/io_uring.c b/fs/io_uring.c +index dd8ad87540ef7..26978630378e0 100644 +--- a/fs/io_uring.c ++++ b/fs/io_uring.c +@@ -4363,7 +4363,8 @@ static int io_sq_thread_acquire_mm(struct io_ring_ctx *ctx, + struct io_kiocb *req) + { + if (io_op_defs[req->opcode].needs_mm && !current->mm) { +- if (unlikely(!mmget_not_zero(ctx->sqo_mm))) ++ if (unlikely(!(ctx->flags & IORING_SETUP_SQPOLL) || ++ !mmget_not_zero(ctx->sqo_mm))) + return -EFAULT; + kthread_use_mm(ctx->sqo_mm); + } +diff --git a/net/core/skbuff.c b/net/core/skbuff.c +index b8afefe6f6b69..7afe52bd038ba 100644 +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c +@@ -5419,8 +5419,8 @@ struct sk_buff *skb_vlan_untag(struct sk_buff *skb) + skb = skb_share_check(skb, GFP_ATOMIC); + if (unlikely(!skb)) + goto err_free; +- +- if (unlikely(!pskb_may_pull(skb, VLAN_HLEN))) ++ /* We may access the two bytes after vlan_hdr in vlan_set_encap_proto(). */ ++ if (unlikely(!pskb_may_pull(skb, VLAN_HLEN + sizeof(unsigned short)))) + goto err_free; + + vhdr = (struct vlan_hdr *)skb->data; +diff --git a/net/ethtool/features.c b/net/ethtool/features.c +index 4e632dc987d85..495635f152ba6 100644 +--- a/net/ethtool/features.c ++++ b/net/ethtool/features.c +@@ -224,7 +224,9 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) + DECLARE_BITMAP(wanted_diff_mask, NETDEV_FEATURE_COUNT); + DECLARE_BITMAP(active_diff_mask, NETDEV_FEATURE_COUNT); + DECLARE_BITMAP(old_active, NETDEV_FEATURE_COUNT); ++ DECLARE_BITMAP(old_wanted, NETDEV_FEATURE_COUNT); + DECLARE_BITMAP(new_active, NETDEV_FEATURE_COUNT); ++ DECLARE_BITMAP(new_wanted, NETDEV_FEATURE_COUNT); + DECLARE_BITMAP(req_wanted, NETDEV_FEATURE_COUNT); + DECLARE_BITMAP(req_mask, NETDEV_FEATURE_COUNT); + struct nlattr *tb[ETHTOOL_A_FEATURES_MAX + 1]; +@@ -250,6 +252,7 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) + + rtnl_lock(); + ethnl_features_to_bitmap(old_active, dev->features); ++ ethnl_features_to_bitmap(old_wanted, dev->wanted_features); + ret = ethnl_parse_bitset(req_wanted, req_mask, NETDEV_FEATURE_COUNT, + tb[ETHTOOL_A_FEATURES_WANTED], + netdev_features_strings, info->extack); +@@ -261,17 +264,15 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) + goto out_rtnl; + } + +- /* set req_wanted bits not in req_mask from old_active */ ++ /* set req_wanted bits not in req_mask from old_wanted */ + bitmap_and(req_wanted, req_wanted, req_mask, NETDEV_FEATURE_COUNT); +- bitmap_andnot(new_active, old_active, req_mask, NETDEV_FEATURE_COUNT); +- bitmap_or(req_wanted, new_active, req_wanted, NETDEV_FEATURE_COUNT); +- if (bitmap_equal(req_wanted, old_active, NETDEV_FEATURE_COUNT)) { +- ret = 0; +- goto out_rtnl; ++ bitmap_andnot(new_wanted, old_wanted, req_mask, NETDEV_FEATURE_COUNT); ++ bitmap_or(req_wanted, new_wanted, req_wanted, NETDEV_FEATURE_COUNT); ++ if (!bitmap_equal(req_wanted, old_wanted, NETDEV_FEATURE_COUNT)) { ++ dev->wanted_features &= ~dev->hw_features; ++ dev->wanted_features |= ethnl_bitmap_to_features(req_wanted) & dev->hw_features; ++ __netdev_update_features(dev); + } +- +- dev->wanted_features = ethnl_bitmap_to_features(req_wanted); +- __netdev_update_features(dev); + ethnl_features_to_bitmap(new_active, dev->features); + mod = !bitmap_equal(old_active, new_active, NETDEV_FEATURE_COUNT); + +diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c +index cc8049b100b24..134e923822750 100644 +--- a/net/ipv4/nexthop.c ++++ b/net/ipv4/nexthop.c +@@ -446,7 +446,7 @@ static int nh_check_attr_group(struct net *net, struct nlattr *tb[], + unsigned int i, j; + u8 nhg_fdb = 0; + +- if (len & (sizeof(struct nexthop_grp) - 1)) { ++ if (!len || len & (sizeof(struct nexthop_grp) - 1)) { + NL_SET_ERR_MSG(extack, + "Invalid length for nexthop group attribute"); + return -EINVAL; +@@ -1187,6 +1187,9 @@ static struct nexthop *nexthop_create_group(struct net *net, + struct nexthop *nh; + int i; + ++ if (WARN_ON(!num_nh)) ++ return ERR_PTR(-EINVAL); ++ + nh = nexthop_alloc(); + if (!nh) + return ERR_PTR(-ENOMEM); +diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c +index a18c378ca5f46..d8f0102cec94a 100644 +--- a/net/ipv6/ip6_tunnel.c ++++ b/net/ipv6/ip6_tunnel.c +@@ -913,7 +913,15 @@ int ip6_tnl_rcv(struct ip6_tnl *t, struct sk_buff *skb, + struct metadata_dst *tun_dst, + bool log_ecn_err) + { +- return __ip6_tnl_rcv(t, skb, tpi, tun_dst, ip6ip6_dscp_ecn_decapsulate, ++ int (*dscp_ecn_decapsulate)(const struct ip6_tnl *t, ++ const struct ipv6hdr *ipv6h, ++ struct sk_buff *skb); ++ ++ dscp_ecn_decapsulate = ip6ip6_dscp_ecn_decapsulate; ++ if (tpi->proto == htons(ETH_P_IP)) ++ dscp_ecn_decapsulate = ip4ip6_dscp_ecn_decapsulate; ++ ++ return __ip6_tnl_rcv(t, skb, tpi, tun_dst, dscp_ecn_decapsulate, + log_ecn_err); + } + EXPORT_SYMBOL(ip6_tnl_rcv); +diff --git a/net/netlink/policy.c b/net/netlink/policy.c +index f6491853c7971..2b3e26f7496f5 100644 +--- a/net/netlink/policy.c ++++ b/net/netlink/policy.c +@@ -51,6 +51,9 @@ static int add_policy(struct nl_policy_dump **statep, + if (!state) + return -ENOMEM; + ++ memset(&state->policies[state->n_alloc], 0, ++ flex_array_size(state, policies, n_alloc - state->n_alloc)); ++ + state->policies[state->n_alloc].policy = policy; + state->policies[state->n_alloc].maxtype = maxtype; + state->n_alloc = n_alloc; +diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c +index 300a104b9a0fb..85ab4559f0577 100644 +--- a/net/qrtr/qrtr.c ++++ b/net/qrtr/qrtr.c +@@ -692,23 +692,25 @@ static void qrtr_port_remove(struct qrtr_sock *ipc) + */ + static int qrtr_port_assign(struct qrtr_sock *ipc, int *port) + { ++ u32 min_port; + int rc; + + mutex_lock(&qrtr_port_lock); + if (!*port) { +- rc = idr_alloc(&qrtr_ports, ipc, +- QRTR_MIN_EPH_SOCKET, QRTR_MAX_EPH_SOCKET + 1, +- GFP_ATOMIC); +- if (rc >= 0) +- *port = rc; ++ min_port = QRTR_MIN_EPH_SOCKET; ++ rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, QRTR_MAX_EPH_SOCKET, GFP_ATOMIC); ++ if (!rc) ++ *port = min_port; + } else if (*port < QRTR_MIN_EPH_SOCKET && !capable(CAP_NET_ADMIN)) { + rc = -EACCES; + } else if (*port == QRTR_PORT_CTRL) { +- rc = idr_alloc(&qrtr_ports, ipc, 0, 1, GFP_ATOMIC); ++ min_port = 0; ++ rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, 0, GFP_ATOMIC); + } else { +- rc = idr_alloc(&qrtr_ports, ipc, *port, *port + 1, GFP_ATOMIC); +- if (rc >= 0) +- *port = rc; ++ min_port = *port; ++ rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, *port, GFP_ATOMIC); ++ if (!rc) ++ *port = min_port; + } + mutex_unlock(&qrtr_port_lock); + +diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c +index 6ed1652d1e265..41d8440deaf14 100644 +--- a/net/sched/act_ct.c ++++ b/net/sched/act_ct.c +@@ -704,7 +704,7 @@ static int tcf_ct_handle_fragments(struct net *net, struct sk_buff *skb, + err = ip_defrag(net, skb, user); + local_bh_enable(); + if (err && err != -EINPROGRESS) +- goto out_free; ++ return err; + + if (!err) + *defrag = true; +diff --git a/net/sctp/stream.c b/net/sctp/stream.c +index bda2536dd740f..6dc95dcc0ff4f 100644 +--- a/net/sctp/stream.c ++++ b/net/sctp/stream.c +@@ -88,12 +88,13 @@ static int sctp_stream_alloc_out(struct sctp_stream *stream, __u16 outcnt, + int ret; + + if (outcnt <= stream->outcnt) +- return 0; ++ goto out; + + ret = genradix_prealloc(&stream->out, outcnt, gfp); + if (ret) + return ret; + ++out: + stream->outcnt = outcnt; + return 0; + } +@@ -104,12 +105,13 @@ static int sctp_stream_alloc_in(struct sctp_stream *stream, __u16 incnt, + int ret; + + if (incnt <= stream->incnt) +- return 0; ++ goto out; + + ret = genradix_prealloc(&stream->in, incnt, gfp); + if (ret) + return ret; + ++out: + stream->incnt = incnt; + return 0; + } +diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c +index e1f64f4ba2361..da9ba6d1679b7 100644 +--- a/net/smc/smc_diag.c ++++ b/net/smc/smc_diag.c +@@ -170,13 +170,15 @@ static int __smc_diag_dump(struct sock *sk, struct sk_buff *skb, + (req->diag_ext & (1 << (SMC_DIAG_DMBINFO - 1))) && + !list_empty(&smc->conn.lgr->list)) { + struct smc_connection *conn = &smc->conn; +- struct smcd_diag_dmbinfo dinfo = { +- .linkid = *((u32 *)conn->lgr->id), +- .peer_gid = conn->lgr->peer_gid, +- .my_gid = conn->lgr->smcd->local_gid, +- .token = conn->rmb_desc->token, +- .peer_token = conn->peer_token +- }; ++ struct smcd_diag_dmbinfo dinfo; ++ ++ memset(&dinfo, 0, sizeof(dinfo)); ++ ++ dinfo.linkid = *((u32 *)conn->lgr->id); ++ dinfo.peer_gid = conn->lgr->peer_gid; ++ dinfo.my_gid = conn->lgr->smcd->local_gid; ++ dinfo.token = conn->rmb_desc->token; ++ dinfo.peer_token = conn->peer_token; + + if (nla_put(skb, SMC_DIAG_DMBINFO, sizeof(dinfo), &dinfo) < 0) + goto errout; +diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c +index c8c47fc726536..d6426b6cc9c5a 100644 +--- a/net/tipc/crypto.c ++++ b/net/tipc/crypto.c +@@ -757,10 +757,12 @@ static void tipc_aead_encrypt_done(struct crypto_async_request *base, int err) + switch (err) { + case 0: + this_cpu_inc(tx->stats->stat[STAT_ASYNC_OK]); ++ rcu_read_lock(); + if (likely(test_bit(0, &b->up))) + b->media->send_msg(net, skb, b, &tx_ctx->dst); + else + kfree_skb(skb); ++ rcu_read_unlock(); + break; + case -EINPROGRESS: + return; +diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c +index 217516357ef26..90e3c70a91ad0 100644 +--- a/net/tipc/netlink_compat.c ++++ b/net/tipc/netlink_compat.c +@@ -275,8 +275,9 @@ err_out: + static int tipc_nl_compat_dumpit(struct tipc_nl_compat_cmd_dump *cmd, + struct tipc_nl_compat_msg *msg) + { +- int err; ++ struct nlmsghdr *nlh; + struct sk_buff *arg; ++ int err; + + if (msg->req_type && (!msg->req_size || + !TLV_CHECK_TYPE(msg->req, msg->req_type))) +@@ -305,6 +306,15 @@ static int tipc_nl_compat_dumpit(struct tipc_nl_compat_cmd_dump *cmd, + return -ENOMEM; + } + ++ nlh = nlmsg_put(arg, 0, 0, tipc_genl_family.id, 0, NLM_F_MULTI); ++ if (!nlh) { ++ kfree_skb(arg); ++ kfree_skb(msg->rep); ++ msg->rep = NULL; ++ return -EMSGSIZE; ++ } ++ nlmsg_end(arg, nlh); ++ + err = __tipc_nl_compat_dumpit(cmd, msg, arg); + if (err) { + kfree_skb(msg->rep);
