Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel-alx-legacy/patches-4.9/0414-4.9.315-all-fixes.patch

    Annotation of /trunk/kernel-alx-legacy/patches-4.9/0414-4.9.315-all-fixes.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3716 - (hide annotations) (download)
    Mon Oct 24 14:08:28 2022 UTC (19 months, 2 weeks ago) by niro
    File size: 13471 byte(s) 
    -linux-4.9.315
    1 niro 3716 diff --git a/Makefile b/Makefile
    2     index 734a4cc6ac464..b849f2683ae68 100644
    3     --- a/Makefile
    4     +++ b/Makefile
    5     @@ -1,6 +1,6 @@
    6     VERSION = 4
    7     PATCHLEVEL = 9
    8     -SUBLEVEL = 314
    9     +SUBLEVEL = 315
    10     EXTRAVERSION =
    11     NAME = Roaring Lionus
    12    
    13     diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c
    14     index cb28e4b4fb108..b87ca56fb774e 100644
    15     --- a/drivers/hwmon/f71882fg.c
    16     +++ b/drivers/hwmon/f71882fg.c
    17     @@ -1590,8 +1590,9 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
    18     temp *= 125;
    19     if (sign)
    20     temp -= 128000;
    21     - } else
    22     - temp = data->temp[nr] * 1000;
    23     + } else {
    24     + temp = ((s8)data->temp[nr]) * 1000;
    25     + }
    26    
    27     return sprintf(buf, "%d\n", temp);
    28     }
    29     diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
    30     index 22bc3dc44298c..aa2cef8675f4e 100644
    31     --- a/drivers/net/ethernet/sfc/ef10.c
    32     +++ b/drivers/net/ethernet/sfc/ef10.c
    33     @@ -5197,6 +5197,11 @@ static int efx_ef10_mtd_probe(struct efx_nic *efx)
    34     n_parts++;
    35     }
    36    
    37     + if (!n_parts) {
    38     + kfree(parts);
    39     + return 0;
    40     + }
    41     +
    42     rc = efx_mtd_add(efx, &parts[0].common, n_parts, sizeof(*parts));
    43     fail:
    44     if (rc)
    45     diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
    46     index a34647efb5ea5..2cd1b3cfcc09a 100644
    47     --- a/drivers/net/wireless/mac80211_hwsim.c
    48     +++ b/drivers/net/wireless/mac80211_hwsim.c
    49     @@ -1987,11 +1987,13 @@ static void hw_scan_work(struct work_struct *work)
    50     memcpy(skb_put(probe, req->ie_len), req->ie,
    51     req->ie_len);
    52    
    53     + rcu_read_lock();
    54     if (!ieee80211_tx_prepare_skb(hwsim->hw,
    55     hwsim->hw_scan_vif,
    56     probe,
    57     hwsim->tmp_chan->band,
    58     NULL)) {
    59     + rcu_read_unlock();
    60     kfree_skb(probe);
    61     continue;
    62     }
    63     @@ -1999,6 +2001,7 @@ static void hw_scan_work(struct work_struct *work)
    64     local_bh_disable();
    65     mac80211_hwsim_tx_frame(hwsim->hw, probe,
    66     hwsim->tmp_chan);
    67     + rcu_read_unlock();
    68     local_bh_enable();
    69     }
    70     }
    71     diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
    72     index c103fc7efe9fd..f2559e20df705 100644
    73     --- a/drivers/s390/net/ctcm_mpc.c
    74     +++ b/drivers/s390/net/ctcm_mpc.c
    75     @@ -624,8 +624,6 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo)
    76     ctcm_clear_busy_do(dev);
    77     }
    78    
    79     - kfree(mpcginfo);
    80     -
    81     return;
    82    
    83     }
    84     @@ -1205,10 +1203,10 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
    85     CTCM_FUNTAIL, dev->name);
    86     priv->stats.rx_dropped++;
    87     /* mpcginfo only used for non-data transfers */
    88     - kfree(mpcginfo);
    89     if (do_debug_data)
    90     ctcmpc_dump_skb(pskb, -8);
    91     }
    92     + kfree(mpcginfo);
    93     }
    94     done:
    95    
    96     @@ -1998,7 +1996,6 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg)
    97     }
    98     break;
    99     }
    100     - kfree(mpcginfo);
    101    
    102     CTCM_PR_DEBUG("ctcmpc:%s() %s xid2:%i xid7:%i xidt_p2:%i \n",
    103     __func__, ch->id, grp->outstanding_xid2,
    104     @@ -2059,7 +2056,6 @@ static void mpc_action_rcvd_xid7(fsm_instance *fsm, int event, void *arg)
    105     mpc_validate_xid(mpcginfo);
    106     break;
    107     }
    108     - kfree(mpcginfo);
    109     return;
    110     }
    111    
    112     diff --git a/drivers/s390/net/ctcm_sysfs.c b/drivers/s390/net/ctcm_sysfs.c
    113     index ddb0aa321339f..07b7177abf260 100644
    114     --- a/drivers/s390/net/ctcm_sysfs.c
    115     +++ b/drivers/s390/net/ctcm_sysfs.c
    116     @@ -38,11 +38,12 @@ static ssize_t ctcm_buffer_write(struct device *dev,
    117     struct ctcm_priv *priv = dev_get_drvdata(dev);
    118     int rc;
    119    
    120     - ndev = priv->channel[CTCM_READ]->netdev;
    121     - if (!(priv && priv->channel[CTCM_READ] && ndev)) {
    122     + if (!(priv && priv->channel[CTCM_READ] &&
    123     + priv->channel[CTCM_READ]->netdev)) {
    124     CTCM_DBF_TEXT(SETUP, CTC_DBF_ERROR, "bfnondev");
    125     return -ENODEV;
    126     }
    127     + ndev = priv->channel[CTCM_READ]->netdev;
    128    
    129     rc = kstrtouint(buf, 0, &bs1);
    130     if (rc)
    131     diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
    132     index 251db0a02e73c..4d3caad7e9814 100644
    133     --- a/drivers/s390/net/lcs.c
    134     +++ b/drivers/s390/net/lcs.c
    135     @@ -1761,10 +1761,11 @@ lcs_get_control(struct lcs_card *card, struct lcs_cmd *cmd)
    136     lcs_schedule_recovery(card);
    137     break;
    138     case LCS_CMD_STOPLAN:
    139     - pr_warn("Stoplan for %s initiated by LGW\n",
    140     - card->dev->name);
    141     - if (card->dev)
    142     + if (card->dev) {
    143     + pr_warn("Stoplan for %s initiated by LGW\n",
    144     + card->dev->name);
    145     netif_carrier_off(card->dev);
    146     + }
    147     break;
    148     default:
    149     LCS_DBF_TEXT(5, trace, "noLGWcmd");
    150     diff --git a/drivers/tty/serial/digicolor-usart.c b/drivers/tty/serial/digicolor-usart.c
    151     index 50ec5f1ac77f4..794864fac6250 100644
    152     --- a/drivers/tty/serial/digicolor-usart.c
    153     +++ b/drivers/tty/serial/digicolor-usart.c
    154     @@ -476,10 +476,10 @@ static int digicolor_uart_probe(struct platform_device *pdev)
    155     return PTR_ERR(uart_clk);
    156    
    157     res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    158     - dp->port.mapbase = res->start;
    159     dp->port.membase = devm_ioremap_resource(&pdev->dev, res);
    160     if (IS_ERR(dp->port.membase))
    161     return PTR_ERR(dp->port.membase);
    162     + dp->port.mapbase = res->start;
    163    
    164     irq = platform_get_irq(pdev, 0);
    165     if (irq < 0)
    166     diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
    167     index f9d39c993f2f3..fb41efd6b8927 100644
    168     --- a/drivers/usb/class/cdc-wdm.c
    169     +++ b/drivers/usb/class/cdc-wdm.c
    170     @@ -744,6 +744,7 @@ static int wdm_release(struct inode *inode, struct file *file)
    171     kill_urbs(desc);
    172     spin_lock_irq(&desc->iuspin);
    173     desc->resp_count = 0;
    174     + clear_bit(WDM_RESPONDING, &desc->flags);
    175     spin_unlock_irq(&desc->iuspin);
    176     desc->manage_power(desc->intf, 0);
    177     } else {
    178     diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
    179     index 3fcf53e85adbb..5b198d881a40a 100644
    180     --- a/drivers/usb/serial/option.c
    181     +++ b/drivers/usb/serial/option.c
    182     @@ -2101,10 +2101,14 @@ static const struct usb_device_id option_ids[] = {
    183     .driver_info = RSVD(3) },
    184     { USB_DEVICE(0x1508, 0x1001), /* Fibocom NL668 (IOT version) */
    185     .driver_info = RSVD(4) | RSVD(5) | RSVD(6) },
    186     + { USB_DEVICE(0x1782, 0x4d10) }, /* Fibocom L610 (AT mode) */
    187     + { USB_DEVICE_INTERFACE_CLASS(0x1782, 0x4d11, 0xff) }, /* Fibocom L610 (ECM/RNDIS mode) */
    188     { USB_DEVICE(0x2cb7, 0x0104), /* Fibocom NL678 series */
    189     .driver_info = RSVD(4) | RSVD(5) },
    190     { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff), /* Fibocom NL678 series */
    191     .driver_info = RSVD(6) },
    192     + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0106, 0xff) }, /* Fibocom MA510 (ECM mode w/ diag intf.) */
    193     + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x010a, 0xff) }, /* Fibocom MA510 (ECM mode) */
    194     { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) }, /* Fibocom FG150 Diag */
    195     { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) }, /* Fibocom FG150 AT */
    196     { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */
    197     diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
    198     index c5fa5b704ec57..008bf34978d5c 100644
    199     --- a/drivers/usb/serial/pl2303.c
    200     +++ b/drivers/usb/serial/pl2303.c
    201     @@ -95,6 +95,7 @@ static const struct usb_device_id id_table[] = {
    202     { USB_DEVICE(HP_VENDOR_ID, HP_LCM220_PRODUCT_ID) },
    203     { USB_DEVICE(HP_VENDOR_ID, HP_LCM960_PRODUCT_ID) },
    204     { USB_DEVICE(HP_VENDOR_ID, HP_LM920_PRODUCT_ID) },
    205     + { USB_DEVICE(HP_VENDOR_ID, HP_LM930_PRODUCT_ID) },
    206     { USB_DEVICE(HP_VENDOR_ID, HP_LM940_PRODUCT_ID) },
    207     { USB_DEVICE(HP_VENDOR_ID, HP_TD620_PRODUCT_ID) },
    208     { USB_DEVICE(CRESSI_VENDOR_ID, CRESSI_EDY_PRODUCT_ID) },
    209     diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
    210     index 908865495b489..849f45a694309 100644
    211     --- a/drivers/usb/serial/pl2303.h
    212     +++ b/drivers/usb/serial/pl2303.h
    213     @@ -133,6 +133,7 @@
    214     #define HP_TD620_PRODUCT_ID 0x0956
    215     #define HP_LD960_PRODUCT_ID 0x0b39
    216     #define HP_LD381_PRODUCT_ID 0x0f7f
    217     +#define HP_LM930_PRODUCT_ID 0x0f9b
    218     #define HP_LCM220_PRODUCT_ID 0x3139
    219     #define HP_LCM960_PRODUCT_ID 0x3239
    220     #define HP_LD220_PRODUCT_ID 0x3524
    221     diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
    222     index f0bd6a66f551e..d14e0bc93c61b 100644
    223     --- a/drivers/usb/serial/qcserial.c
    224     +++ b/drivers/usb/serial/qcserial.c
    225     @@ -170,6 +170,8 @@ static const struct usb_device_id id_table[] = {
    226     {DEVICE_SWI(0x1199, 0x9090)}, /* Sierra Wireless EM7565 QDL */
    227     {DEVICE_SWI(0x1199, 0x9091)}, /* Sierra Wireless EM7565 */
    228     {DEVICE_SWI(0x1199, 0x90d2)}, /* Sierra Wireless EM9191 QDL */
    229     + {DEVICE_SWI(0x1199, 0xc080)}, /* Sierra Wireless EM7590 QDL */
    230     + {DEVICE_SWI(0x1199, 0xc081)}, /* Sierra Wireless EM7590 */
    231     {DEVICE_SWI(0x413c, 0x81a2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */
    232     {DEVICE_SWI(0x413c, 0x81a3)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */
    233     {DEVICE_SWI(0x413c, 0x81a4)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */
    234     diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
    235     index b692edeb0b90e..27abbd7fbb2b8 100644
    236     --- a/include/linux/netdev_features.h
    237     +++ b/include/linux/netdev_features.h
    238     @@ -139,7 +139,7 @@ enum {
    239     #define NETIF_F_BUSY_POLL __NETIF_F(BUSY_POLL)
    240     #define NETIF_F_HW_TC __NETIF_F(HW_TC)
    241    
    242     -/* Finds the next feature with the highest number of the range of start till 0.
    243     +/* Finds the next feature with the highest number of the range of start-1 till 0.
    244     */
    245     static inline int find_next_netdev_feature(u64 feature, unsigned long start)
    246     {
    247     @@ -158,7 +158,7 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)
    248     for ((bit) = find_next_netdev_feature((mask_addr), \
    249     NETDEV_FEATURE_COUNT); \
    250     (bit) >= 0; \
    251     - (bit) = find_next_netdev_feature((mask_addr), (bit) - 1))
    252     + (bit) = find_next_netdev_feature((mask_addr), (bit)))
    253    
    254     /* Features valid for ethtool to change */
    255     /* = all defined minus driver/device-class-related */
    256     diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
    257     index dd4e46af1e531..23646a08ed7bd 100644
    258     --- a/net/ipv4/ping.c
    259     +++ b/net/ipv4/ping.c
    260     @@ -302,6 +302,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
    261     struct net *net = sock_net(sk);
    262     if (sk->sk_family == AF_INET) {
    263     struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
    264     + u32 tb_id = RT_TABLE_LOCAL;
    265     int chk_addr_ret;
    266    
    267     if (addr_len < sizeof(*addr))
    268     @@ -315,7 +316,8 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
    269     pr_debug("ping_check_bind_addr(sk=%p,addr=%pI4,port=%d)\n",
    270     sk, &addr->sin_addr.s_addr, ntohs(addr->sin_port));
    271    
    272     - chk_addr_ret = inet_addr_type(net, addr->sin_addr.s_addr);
    273     + tb_id = l3mdev_fib_table_by_index(net, sk->sk_bound_dev_if) ? : tb_id;
    274     + chk_addr_ret = inet_addr_type_table(net, addr->sin_addr.s_addr, tb_id);
    275    
    276     if (addr->sin_addr.s_addr == htonl(INADDR_ANY))
    277     chk_addr_ret = RTN_LOCAL;
    278     @@ -357,6 +359,14 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
    279     return -ENODEV;
    280     }
    281     }
    282     +
    283     + if (!dev && sk->sk_bound_dev_if) {
    284     + dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if);
    285     + if (!dev) {
    286     + rcu_read_unlock();
    287     + return -ENODEV;
    288     + }
    289     + }
    290     has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
    291     scoped);
    292     rcu_read_unlock();
    293     diff --git a/net/ipv4/route.c b/net/ipv4/route.c
    294     index f05b8d63dba38..624bdd74583b6 100644
    295     --- a/net/ipv4/route.c
    296     +++ b/net/ipv4/route.c
    297     @@ -1606,6 +1606,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
    298     #endif
    299     RT_CACHE_STAT_INC(in_slow_mc);
    300    
    301     + skb_dst_drop(skb);
    302     skb_dst_set(skb, &rth->dst);
    303     return 0;
    304    
    305     diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
    306     index a8674e9ff37b7..47b1631bf14cb 100644
    307     --- a/net/netlink/af_netlink.c
    308     +++ b/net/netlink/af_netlink.c
    309     @@ -1929,7 +1929,6 @@ static int netlink_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
    310     copied = len;
    311     }
    312    
    313     - skb_reset_transport_header(data_skb);
    314     err = skb_copy_datagram_msg(data_skb, 0, msg, copied);
    315    
    316     if (msg->msg_name) {
    317     diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
    318     index e7aef841f87d2..1a55f6aecdfe4 100644
    319     --- a/sound/soc/codecs/max98090.c
    320     +++ b/sound/soc/codecs/max98090.c
    321     @@ -419,6 +419,9 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol,
    322    
    323     val = (val >> mc->shift) & mask;
    324    
    325     + if (sel < 0 || sel > mc->max)
    326     + return -EINVAL;
    327     +
    328     *select = sel;
    329    
    330     /* Setting a volume is only valid if it is already On */
    331     @@ -433,7 +436,7 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol,
    332     mask << mc->shift,
    333     sel << mc->shift);
    334    
    335     - return 0;
    336     + return *select != val;
    337     }
    338    
    339     static const char *max98090_perf_pwr_text[] =
    340     diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
    341     index 74968ddee49fa..90ba5521c189d 100644
    342     --- a/sound/soc/soc-ops.c
    343     +++ b/sound/soc/soc-ops.c
    344     @@ -528,7 +528,15 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
    345     unsigned int mask = (1 << fls(max)) - 1;
    346     unsigned int invert = mc->invert;
    347     unsigned int val, val_mask;
    348     - int err, ret;
    349     + int err, ret, tmp;
    350     +
    351     + tmp = ucontrol->value.integer.value[0];
    352     + if (tmp < 0)
    353     + return -EINVAL;
    354     + if (mc->platform_max && tmp > mc->platform_max)
    355     + return -EINVAL;
    356     + if (tmp > mc->max - mc->min + 1)
    357     + return -EINVAL;
    358    
    359     if (invert)
    360     val = (max - ucontrol->value.integer.value[0]) & mask;
    361     @@ -543,6 +551,14 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
    362     ret = err;
    363    
    364     if (snd_soc_volsw_is_stereo(mc)) {
    365     + tmp = ucontrol->value.integer.value[1];
    366     + if (tmp < 0)
    367     + return -EINVAL;
    368     + if (mc->platform_max && tmp > mc->platform_max)
    369     + return -EINVAL;
    370     + if (tmp > mc->max - mc->min + 1)
    371     + return -EINVAL;
    372     +
    373     if (invert)
    374     val = (max - ucontrol->value.integer.value[1]) & mask;
    375     else