Linux 4.4.137
Greg KH
maintainerI'm announcing the release of the 4.4.137 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/networking/netdev-FAQ.txt | 9 +++++ Makefile | 2 - drivers/char/tpm/tpm-chip.c | 13 ++++++++ drivers/char/tpm/tpm-interface.c | 7 ++++ drivers/char/tpm/tpm.h | 1 drivers/gpu/drm/drm_fops.c | 1 drivers/isdn/hardware/eicon/diva.c | 22 +++++++++----- drivers/isdn/hardware/eicon/diva.h | 5 +-- drivers/isdn/hardware/eicon/divasmain.c | 18 +++++++---- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 - drivers/net/ethernet/cisco/enic/enic_main.c | 8 ++--- drivers/net/ethernet/mellanox/mlx4/qp.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 2 - drivers/net/phy/bcm-cygnus.c | 6 +-- drivers/net/phy/bcm-phy-lib.h | 7 ++++ drivers/net/phy/bcm7xxx.c | 4 +- drivers/net/team/team.c | 3 + drivers/net/usb/cdc_mbim.c | 2 - drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 2 - fs/xfs/xfs_log.c | 7 ---- mm/mmap.c | 32 +++++++++++++++++++++ net/core/rtnetlink.c | 8 ++--- net/dccp/proto.c | 2 - net/ipv4/fib_semantics.c | 2 + net/ipv4/ip_sockglue.c | 2 - net/ipv6/ip6mr.c | 3 + net/packet/af_packet.c | 4 +- scripts/kconfig/confdata.c | 2 - 28 files changed, 128 insertions(+), 52 deletions(-)
Alexey Kodanev (1):
dccp: don't free ccid2_hc_tx_sock struct in dccp_disconnect()
Amir Goldstein (1):
xfs: fix incorrect log_flushed on fsync
Chris Chiu (1):
tpm: self test failure should not cause suspend to fail
Cong Wang (1):
netdev-FAQ: clarify DaveM's position for stable backports
Dan Carpenter (1):
team: use netdev_features_t instead of u32
Daniele Palmas (1):
net: usb: cdc_mbim: add flag FLAG_SEND_ZLP
Dave Airlie (1):
drm: set FMODE_UNSIGNED_OFFSET for drm files
Enric Balletbo i Serra (1):
tpm: do not suspend/resume if power stays on
Eric Dumazet (3):
net/packet: refine check for priv area size
rtnetlink: validate attributes in do_setlink()
net: metrics: add proper netlink validation
Florian Fainelli (1):
net: phy: broadcom: Fix bcm_write_exp()
Govindarajulu Varadarajan (1):
enic: set DMA mask to 47 bit
Greg Kroah-Hartman (1):
Linux 4.4.137
Jack Morgenstein (1):
net/mlx4: Fix irq-unsafe spinlock usage
Julia Lawall (1):
bnx2x: use the right constant
Linus Torvalds (2):
mmap: introduce sane default mmap limits
mmap: relax file size limit for regular files
Nathan Chancellor (1):
kconfig: Avoid format overflow warning from GCC 8.1
Sabrina Dubroca (1):
ip6mr: only set ip6mr_table from setsockopt when ip6mr_new_table succeeds
Shahed Shaikh (1):
qed: Fix mask for physical address in ILT entry
Stefan Wahren (1):
brcmfmac: Fix check for ISO3166 code
Wenwen Wang (1):
isdn: eicon: fix a missing-check bug
Willem de Bruijn (2):
ipv4: remove warning in ip_recv_error
packet: fix reserve calculation
Greg KH
maintainerDocumentation/networking/netdev-FAQ.txt +9 -0
@@ -168,6 +168,15 @@ A: No. See above answer. In short, if you think it really belongs in dash marker line as described in Documentation/SubmittingPatches to temporarily embed that information into the patch that you send. +Q: Are all networking bug fixes backported to all stable releases? + +A: Due to capacity, Dave could only take care of the backports for the last + 2 stable releases. For earlier stable releases, each stable branch maintainer + is supposed to take care of them. If you find any patch is missing from an + earlier stable branch, please notify [email protected] with either a + commit ID or a formal patch backported, and CC Dave and other relevant + networking developers. + Q: Someone said that the comment style and coding convention is different for the networking content. Is this true?
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 136 +SUBLEVEL = 137 EXTRAVERSION = NAME = Blurry Fish Butt
drivers/char/tpm/tpm-chip.c +13 -0
@@ -26,6 +26,7 @@#include <linux/spinlock.h> #include <linux/freezer.h> #include <linux/major.h> +#include <linux/of.h> #include "tpm.h" #include "tpm_eventlog.h"
@@ -324,8 +325,20 @@ static void tpm1_chip_unregister(struct tpm_chip *chip)*/ int tpm_chip_register (struct tpm_chip *chip) { +#ifdef CONFIG_OF +struct device_node *np; +#endif int rc; +#ifdef CONFIG_OF + np =of_find_node_by_name (NULL ,"vtpm" ); +if (np) { +if (of_property_read_bool (np,"powered-while-suspended" )) + chip->flags |=TPM_CHIP_FLAG_ALWAYS_POWERED ; + } +of_node_put (np); +#endif + rc =tpm1_chip_register (chip);if (rc)return rc;
drivers/char/tpm/tpm-interface.c +7 -0
@@ -787,6 +787,10 @@ int tpm_do_selftest(struct tpm_chip *chip) loops =jiffies_to_msecs (duration) / delay_msec; rc =tpm_continue_selftest (chip); +if (rc ==TPM_ERR_INVALID_POSTINIT ) { + chip->flags |=TPM_CHIP_FLAG_ALWAYS_POWERED ; +dev_info (&chip->dev,"TPM not ready (%d)\n" , rc); + }/* This may fail if there was no TPM driver during a suspend/resume * cycle; some may return 10 (BAD_ORDINAL), others 28 (FAILEDSELFTEST) */
@@ -931,6 +935,9 @@ int tpm_pm_suspend(struct device *dev)if (chip ==NULL )return -ENODEV ; +if (chip->flags &TPM_CHIP_FLAG_ALWAYS_POWERED ) +return 0 ; +if (chip->flags &TPM_CHIP_FLAG_TPM2 ) {tpm2_shutdown (chip,TPM2_SU_STATE );return 0 ;
drivers/char/tpm/tpm.h +1 -0
@@ -168,6 +168,7 @@ struct tpm_vendor_specific {enum tpm_chip_flags {TPM_CHIP_FLAG_REGISTERED =BIT (0 ),TPM_CHIP_FLAG_TPM2 =BIT (1 ), +TPM_CHIP_FLAG_ALWAYS_POWERED =BIT (5 ), };struct tpm_chip {
drivers/gpu/drm/drm_fops.c +1 -0
@@ -209,6 +209,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)return -ENOMEM ; filp->private_data = priv; + filp->f_mode |=FMODE_UNSIGNED_OFFSET ; priv->filp = filp; priv->uid =current_euid (); priv->pid =get_pid (task_pid (current));
drivers/isdn/hardware/eicon/diva.c +15 -7
@@ -387,10 +387,10 @@ void divasa_xdi_driver_unload(void)** Receive and process command from user mode utility */ void *diva_xdi_open_adapter (void *os_handle,const void __user *src, -int length, +int length,void *mptr,divas_xdi_copy_from_user_fn_t cp_fn) { -diva_xdi_um_cfg_cmd_t msg; +diva_xdi_um_cfg_cmd_t *msg = (diva_xdi_um_cfg_cmd_t *)mptr;diva_os_xdi_adapter_t *a =NULL ;diva_os_spin_lock_magic_t old_irql;struct list_head *tmp;
@@ -400,21 +400,21 @@ void *diva_xdi_open_adapter(void *os_handle, const void __user *src, length, sizeof(diva_xdi_um_cfg_cmd_t)))return NULL ; } -if ((*cp_fn) (os_handle, &msg, src,sizeof (msg)) <=0 ) { +if ((*cp_fn) (os_handle, msg, src,sizeof (*msg)) <=0 ) { DBG_ERR(("A: A(?) open, write error"))return NULL ; }diva_os_enter_spin_lock (&adapter_lock, &old_irql,"open_adapter" );list_for_each (tmp, &adapter_queue) { a =list_entry (tmp, diva_os_xdi_adapter_t, link); -if (a->controller == (int )msg.adapter) +if (a->controller == (int )msg->adapter)break ; a =NULL ; }diva_os_leave_spin_lock (&adapter_lock, &old_irql,"open_adapter" );if (!a) { - DBG_ERR(("A: A(%d) open, adapter not found", msg.adapter)) + DBG_ERR(("A: A(%d) open, adapter not found", msg->adapter)) }return (a);
@@ -436,8 +436,10 @@ void diva_xdi_close_adapter(void *adapter, void *os_handle)int diva_xdi_write (void *adapter,void *os_handle,const void __user *src, -int length,divas_xdi_copy_from_user_fn_t cp_fn) +int length,void *mptr, +divas_xdi_copy_from_user_fn_t cp_fn) { +diva_xdi_um_cfg_cmd_t *msg = (diva_xdi_um_cfg_cmd_t *)mptr;diva_os_xdi_adapter_t *a = (diva_os_xdi_adapter_t *) adapter;void *data;
@@ -458,7 +460,13 @@ diva_xdi_write(void *adapter, void *os_handle, const void __user *src,return (-2 ); } - length = (*cp_fn) (os_handle, data, src, length); +if (msg) { + *(diva_xdi_um_cfg_cmd_t *)data = *msg; + length = (*cp_fn) (os_handle, (char *)data +sizeof (*msg), + src +sizeof (*msg), length -sizeof (*msg)); + }else { + length = (*cp_fn) (os_handle, data, src, length); + }if (length >0 ) {if ((*(a->interface.cmd_proc)) (a, (diva_xdi_um_cfg_cmd_t *) data, length)) {
drivers/isdn/hardware/eicon/diva.h +3 -2
@@ -19,10 +19,11 @@ int diva_xdi_read(void *adapter, void *os_handle, void __user *dst, int max_length, divas_xdi_copy_to_user_fn_t cp_fn);int diva_xdi_write (void *adapter,void *os_handle,const void __user *src, -int length,divas_xdi_copy_from_user_fn_t cp_fn); +int length,void *msg, +divas_xdi_copy_from_user_fn_t cp_fn);void *diva_xdi_open_adapter (void *os_handle,const void __user *src, -int length, +int length,void *msg,divas_xdi_copy_from_user_fn_t cp_fn);void diva_xdi_close_adapter (void *adapter,void *os_handle);
drivers/isdn/hardware/eicon/divasmain.c +11 -7
@@ -591,19 +591,22 @@ static int divas_release(struct inode *inode, struct file *file)static ssize_t divas_write (struct file *file,const char __user *buf,size_t count,loff_t *ppos) { +diva_xdi_um_cfg_cmd_t msg;int ret = -EINVAL ;if (!file->private_data) { file->private_data =diva_xdi_open_adapter (file, buf, - count, + count, &msg, xdi_copy_from_user); - } -if (!file->private_data) { -return (-ENODEV ); +if (!file->private_data) +return (-ENODEV ); + ret =diva_xdi_write (file->private_data, file, + buf, count, &msg, xdi_copy_from_user); + }else { + ret =diva_xdi_write (file->private_data, file, + buf, count,NULL , xdi_copy_from_user); } - ret =diva_xdi_write (file->private_data, file, - buf, count, xdi_copy_from_user);switch (ret) {case -1 :/* Message should be removed from rx mailbox first */ ret = -EBUSY ;
@@ -622,11 +625,12 @@ static ssize_t divas_write(struct file *file, const char __user *buf,static ssize_t divas_read (struct file *file,char __user *buf,size_t count,loff_t *ppos) { +diva_xdi_um_cfg_cmd_t msg;int ret = -EINVAL ;if (!file->private_data) { file->private_data =diva_xdi_open_adapter (file, buf, - count, + count, &msg, xdi_copy_from_user); }if (!file->private_data) {
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +1 -1
@@ -594,7 +594,7 @@ static void bnx2x_ets_e3b0_nig_disabled(const struct link_params *params,* slots for the highest priority. */ REG_WR (bp, (port) ?NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS : -NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS ,0x100 ); +NIG_REG_P0_TX_ARB_NUM_STRICT_ARB_SLOTS ,0x100 );/* Mapping between the CREDIT_WEIGHT registers and actual client * numbers */
drivers/net/ethernet/cisco/enic/enic_main.c +4 -4
@@ -2543,11 +2543,11 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_master (pdev);/* Query PCI controller on system for DMA addressing -* limitation for the device. Try 64-bit first, and +* limitation for the device. Try 47-bit first, and * fail to 32-bit. */ - err =pci_set_dma_mask (pdev,DMA_BIT_MASK (64 )); + err =pci_set_dma_mask (pdev,DMA_BIT_MASK (47 ));if (err) { err =pci_set_dma_mask (pdev,DMA_BIT_MASK (32 ));if (err) {
@@ -2561,10 +2561,10 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_release_regions; } }else { - err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (64 )); + err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (47 ));if (err) {dev_err (dev,"Unable to obtain %u-bit DMA " -"for consistent allocations, aborting\n" ,64 ); +"for consistent allocations, aborting\n" ,47 ); goto err_out_release_regions; } using_dac =1 ;
drivers/net/ethernet/mellanox/mlx4/qp.c +2 -2
@@ -386,11 +386,11 @@ struct mlx4_qp *mlx4_qp_lookup(struct mlx4_dev *dev, u32 qpn)struct mlx4_qp_table *qp_table = &mlx4_priv (dev)->qp_table;struct mlx4_qp *qp; -spin_lock (&qp_table->lock); +spin_lock_irq (&qp_table->lock); qp =__mlx4_qp_lookup (dev, qpn); -spin_unlock (&qp_table->lock); +spin_unlock_irq (&qp_table->lock);return qp; }
drivers/net/ethernet/qlogic/qed/qed_cxt.c +1 -1
@@ -43,7 +43,7 @@#define ILT_CFG_REG (cli, reg) PSWRQ2_REG_ ## cli ## _ ## reg ## _RT_OFFSET/* ILT entry structure */ -#define ILT_ENTRY_PHY_ADDR_MASK 0x000FFFFFFFFFFFULL +#define ILT_ENTRY_PHY_ADDR_MASK (~0ULL >> 12)#define ILT_ENTRY_PHY_ADDR_SHIFT 0#define ILT_ENTRY_VALID_MASK 0x1ULL#define ILT_ENTRY_VALID_SHIFT 52
drivers/net/phy/bcm-cygnus.c +3 -3
@@ -61,17 +61,17 @@ static int bcm_cygnus_afe_config(struct phy_device *phydev)return rc;/* make rcal=100, since rdb default is 000 */ - rc =bcm_phy_write_exp (phydev,MII_BRCM_CORE_EXPB1 ,0x10 ); + rc =bcm_phy_write_exp_sel (phydev,MII_BRCM_CORE_EXPB1 ,0x10 );if (rc <0 )return rc;/* CORE_EXPB0, Reset R_CAL/RC_CAL Engine */ - rc =bcm_phy_write_exp (phydev,MII_BRCM_CORE_EXPB0 ,0x10 ); + rc =bcm_phy_write_exp_sel (phydev,MII_BRCM_CORE_EXPB0 ,0x10 );if (rc <0 )return rc;/* CORE_EXPB0, Disable Reset R_CAL/RC_CAL Engine */ - rc =bcm_phy_write_exp (phydev,MII_BRCM_CORE_EXPB0 ,0x00 ); + rc =bcm_phy_write_exp_sel (phydev,MII_BRCM_CORE_EXPB0 ,0x00 );return 0 ; }
drivers/net/phy/bcm-phy-lib.h +7 -0
@@ -14,11 +14,18 @@#ifndef _LINUX_BCM_PHY_LIB_H#define _LINUX_BCM_PHY_LIB_H +#include <linux/brcmphy.h> #include <linux/phy.h> int bcm_phy_write_exp (struct phy_device *phydev,u16 reg,u16 val);int bcm_phy_read_exp (struct phy_device *phydev,u16 reg); +static inline int bcm_phy_write_exp_sel (struct phy_device *phydev, +u16 reg,u16 val) +{ +return bcm_phy_write_exp (phydev, reg |MII_BCM54XX_EXP_SEL_ER , val); +} +int bcm_phy_write_misc (struct phy_device *phydev,u16 reg,u16 chl,u16 value); int bcm_phy_read_misc(struct phy_device *phydev,
drivers/net/phy/bcm7xxx.c +2 -2
@@ -48,10 +48,10 @@static void r_rc_cal_reset (struct phy_device *phydev) {/* Reset R_CAL/RC_CAL Engine */ -bcm_phy_write_exp (phydev,0x00b0 ,0x0010 ); +bcm_phy_write_exp_sel (phydev,0x00b0 ,0x0010 );/* Disable Reset R_AL/RC_CAL Engine */ -bcm_phy_write_exp (phydev,0x00b0 ,0x0000 ); +bcm_phy_write_exp_sel (phydev,0x00b0 ,0x0000 ); }static int bcm7xxx_28nm_b0_afe_config_init (struct phy_device *phydev)
drivers/net/team/team.c +2 -1
@@ -983,7 +983,8 @@ static void team_port_disable(struct team *team,static void ___team_compute_features (struct team *team) {struct team_port *port; -u32 vlan_features =TEAM_VLAN_FEATURES &NETIF_F_ALL_FOR_ALL ; +netdev_features_t vlan_features =TEAM_VLAN_FEATURES & +NETIF_F_ALL_FOR_ALL ;unsigned short max_hard_header_len =ETH_HLEN ;unsigned int dst_release_flag =IFF_XMIT_DST_RELEASE |IFF_XMIT_DST_RELEASE_PERM ;
drivers/net/usb/cdc_mbim.c +1 -1
@@ -593,7 +593,7 @@ static const struct driver_info cdc_mbim_info_zlp = {*/ static const struct driver_info cdc_mbim_info_ndp_to_end = { .description ="CDC MBIM" , - .flags =FLAG_NO_SETINT |FLAG_MULTI_PACKET |FLAG_WWAN , + .flags =FLAG_NO_SETINT |FLAG_MULTI_PACKET |FLAG_WWAN |FLAG_SEND_ZLP , .bind = cdc_mbim_bind, .unbind = cdc_mbim_unbind, .manage_power = cdc_mbim_manage_power,
drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +1 -1
@@ -6167,7 +6167,7 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy, req->alpha2[0], req->alpha2[1]);/* ignore non-ISO3166 country codes */ -for (i =0 ; i <sizeof (req->alpha2); i++) +for (i =0 ; i <2 ; i++)if (req->alpha2[i] <'A' || req->alpha2[i] >'Z' ) {brcmf_err ("not a ISO3166 code\n" );return ;
fs/xfs/xfs_log.c +0 -7
@@ -3323,8 +3323,6 @@ maybe_sleep:*/ if (iclog->ic_state &XLOG_STATE_IOERROR )return -EIO ; -if (log_flushed) - *log_flushed =1 ; }else { no_sleep:
@@ -3432,8 +3430,6 @@ try_again:xlog_wait (&iclog->ic_prev->ic_write_wait, &log->l_icloglock); -if (log_flushed) - *log_flushed =1 ; already_slept =1 ; goto try_again; }
@@ -3467,9 +3463,6 @@ try_again:*/ if (iclog->ic_state &XLOG_STATE_IOERROR )return -EIO ; - -if (log_flushed) - *log_flushed =1 ; }else {/* just return */ spin_unlock (&log->l_icloglock); }
mm/mmap.c +32 -0
@@ -1275,6 +1275,35 @@ static inline int mlock_future_check(struct mm_struct *mm,return 0 ; } +static inline u64 file_mmap_size_max (struct file *file,struct inode *inode) +{ +if (S_ISREG (inode->i_mode)) +return MAX_LFS_FILESIZE ; + +if (S_ISBLK (inode->i_mode)) +return MAX_LFS_FILESIZE ; + +/* Special "we do even unsigned file positions" case */ +if (file->f_mode &FMODE_UNSIGNED_OFFSET ) +return 0 ; + +/* Yes, random drivers might want more. But I'm tired of buggy drivers */ +return ULONG_MAX ; +} + +static inline bool file_mmap_ok (struct file *file,struct inode *inode, +unsigned long pgoff,unsigned long len) +{ +u64 maxsize =file_mmap_size_max (file, inode); + +if (maxsize && len > maxsize) +return false; + maxsize -= len; +if (pgoff > maxsize >>PAGE_SHIFT ) +return false; +return true; +} +/* * The caller must hold down_write(¤t->mm->mmap_sem). */
@@ -1340,6 +1369,9 @@ unsigned long do_mmap(struct file *file, unsigned long addr,if (file) {struct inode *inode =file_inode (file); +if (!file_mmap_ok (file, inode, pgoff, len)) +return -EOVERFLOW ; +switch (flags &MAP_TYPE ) {case MAP_SHARED :if ((prot&PROT_WRITE ) && !(file->f_mode&FMODE_WRITE ))
net/core/rtnetlink.c +4 -4
@@ -1691,6 +1691,10 @@ static int do_setlink(const struct sk_buff *skb,const struct net_device_ops *ops = dev->netdev_ops;int err; + err =validate_linkmsg (dev, tb); +if (err <0 ) +return err; +if (tb[IFLA_NET_NS_PID ] || tb[IFLA_NET_NS_FD ]) {struct net *net =rtnl_link_get_net (dev_net (dev), tb);if (IS_ERR (net)) {
@@ -1982,10 +1986,6 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh) goto errout; } - err =validate_linkmsg (dev, tb); -if (err <0 ) - goto errout; - err =do_setlink (skb, dev, ifm, tb, ifname,0 ); errout:return err;
net/dccp/proto.c +0 -2
@@ -280,9 +280,7 @@ int dccp_disconnect(struct sock *sk, int flags)dccp_clear_xmit_timers (sk);ccid_hc_rx_delete (dp->dccps_hc_rx_ccid, sk); -ccid_hc_tx_delete (dp->dccps_hc_tx_ccid, sk); dp->dccps_hc_rx_ccid =NULL ; - dp->dccps_hc_tx_ccid =NULL ;__skb_queue_purge (&sk->sk_receive_queue);__skb_queue_purge (&sk->sk_write_queue);
net/ipv4/fib_semantics.c +2 -0
@@ -979,6 +979,8 @@ fib_convert_metrics(struct fib_info *fi, const struct fib_config *cfg)if (val ==TCP_CA_UNSPEC )return -EINVAL ; }else { +if (nla_len (nla) !=sizeof (u32)) +return false; val =nla_get_u32 (nla); }if (type ==RTAX_ADVMSS && val >65535 -40 )
net/ipv4/ip_sockglue.c +0 -2
@@ -493,8 +493,6 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)int err;int copied; -WARN_ON_ONCE (sk->sk_family ==AF_INET6 ); - err = -EAGAIN ; skb =sock_dequeue_err_skb (sk);if (!skb)
net/ipv6/ip6mr.c +2 -1
@@ -1787,7 +1787,8 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns ret =0 ;if (!ip6mr_new_table (net, v)) ret = -ENOMEM ; -raw6_sk (sk)->ip6mr_table = v; +else +raw6_sk (sk)->ip6mr_table = v;rtnl_unlock ();return ret; }
net/packet/af_packet.c +2 -2
@@ -2779,7 +2779,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)if (unlikely (offset <0 )) goto out_free; }else if (reserve) { -skb_push (skb, reserve); +skb_reserve (skb, -reserve); }/* Returns -EFAULT on error */
@@ -4198,7 +4198,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, goto out;if (po->tp_version >=TPACKET_V3 && req->tp_block_size <= -BLK_PLUS_PRIV ((u64 )req_u->req3.tp_sizeof_priv)) +BLK_PLUS_PRIV ((u64 )req_u->req3.tp_sizeof_priv) +sizeof (struct tpacket3_hdr )) goto out;if (unlikely (req->tp_frame_size < po->tp_hdrlen + po->tp_reserve))
scripts/kconfig/confdata.c +1 -1
@@ -743,7 +743,7 @@ int conf_write(const char *name)struct menu *menu;const char *basename;const char *str; -char dirname[PATH_MAX +1 ], tmpname[PATH_MAX +1 ], newname[PATH_MAX +1 ]; +char dirname[PATH_MAX +1 ], tmpname[PATH_MAX +22 ], newname[PATH_MAX +8 ];char *env; dirname[0 ] =0 ;