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