Linux 4.16.6
Greg KH
maintainerI'm announcing the release of the 4.16.6 kernel.
All users of the 4.16 kernel series must upgrade.
The updated 4.16.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.16.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/ip-sysctl.txt | 8 Makefile | 2 arch/s390/kernel/perf_cpum_cf_events.c | 8 arch/s390/kernel/uprobes.c | 9 drivers/acpi/acpi_video.c | 27 + drivers/block/swim.c | 49 +- drivers/block/swim3.c | 6 drivers/cdrom/cdrom.c | 2 drivers/char/tpm/tpm-interface.c | 131 +++++-- drivers/char/tpm/tpm.h | 1 drivers/char/tpm/tpm_crb.c | 108 ++++-- drivers/char/tpm/tpm_tis_core.c | 4 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 drivers/hwmon/k10temp.c | 17 drivers/message/fusion/mptsas.c | 1 drivers/net/bonding/bond_main.c | 3 drivers/net/ethernet/amd/xgbe/xgbe-common.h | 8 drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 16 drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 196 +++++++++-- drivers/net/ethernet/amd/xgbe/xgbe.h | 9 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 8 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 16 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 49 +- drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h | 2 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 drivers/net/ethernet/marvell/mvpp2.c | 12 drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 7 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 drivers/net/ethernet/ti/cpsw.c | 2 drivers/net/macsec.c | 5 drivers/net/ppp/pppoe.c | 4 drivers/net/team/team.c | 38 +- drivers/net/tun.c | 7 drivers/net/usb/qmi_wwan.c | 1 drivers/net/virtio_net.c | 79 ++-- drivers/net/vmxnet3/vmxnet3_drv.c | 17 drivers/net/vmxnet3/vmxnet3_int.h | 4 drivers/net/wireless/ath/ath10k/mac.c | 5 drivers/pinctrl/intel/pinctrl-intel.c | 23 - drivers/s390/block/dasd_alias.c | 13 drivers/s390/cio/chsc.c | 14 drivers/s390/net/qeth_core.h | 2 drivers/s390/net/qeth_core_main.c | 115 ++---- include/linux/fsnotify_backend.h | 4 include/linux/hmm.h | 9 include/linux/if_vlan.h | 7 include/linux/tpm.h | 2 include/net/ife.h | 3 include/net/llc_conn.h | 1 kernel/kprobes.c | 2 kernel/trace/trace_entries.h | 2 net/core/dev.c | 2 net/core/neighbour.c | 40 +- net/dns_resolver/dns_key.c | 12 net/ife/ife.c | 38 ++ net/ipv4/tcp.c | 8 net/ipv4/tcp_input.c | 7 net/ipv6/route.c | 2 net/ipv6/seg6_iptunnel.c | 2 net/l2tp/l2tp_core.c | 40 +- net/l2tp/l2tp_core.h | 3 net/l2tp/l2tp_debugfs.c | 18 - net/l2tp/l2tp_netlink.c | 11 net/l2tp/l2tp_ppp.c | 34 + net/llc/af_llc.c | 14 net/llc/llc_c_ac.c | 9 net/llc/llc_conn.c | 22 + net/packet/af_packet.c | 83 +++- net/packet/internal.h | 10 net/sched/act_ife.c | 9 net/sctp/ipv6.c | 60 +-- net/smc/af_smc.c | 10 net/strparser/strparser.c | 9 net/tipc/netlink.c | 3 net/vmw_vsock/af_vsock.c | 6 security/commoncap.c | 2 80 files changed, 1083 insertions(+), 479 deletions(-)
Ahmed Abdelsalam (1):
ipv6: sr: fix NULL pointer dereference in seg6_do_srh_encap()- v4 pkts
Alexander Aring (3):
net: sched: ife: signal not finding metaid
net: sched: ife: handle malformed tlv length
net: sched: ife: check on metadata length
André Wild (1):
s390/cpum_cf: rename IBM z13/z14 counter names
Bjørn Mork (1):
tun: fix vlan packet truncation
Cong Wang (3):
llc: delete timers synchronously in llc_sk_free()
llc: hold llc_sap before release_sock()
llc: fix NULL pointer deref for SOCK_ZAPPED
Dan Carpenter (2):
Revert "macsec: missing dev_put() on error in macsec_newlink()"
cdrom: information leak in cdrom_ioctl_media_changed()
Doron Roberts-Kedes (2):
strparser: Do not call mod_delayed_work with a timeout of LONG_MAX
strparser: Fix incorrect strp->need_bytes value.
Eric Biggers (1):
KEYS: DNS: limit the length of option strings
Eric Dumazet (5):
ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy
net: af_packet: fix race in PACKET_{R|T}X_RING
tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets
tipc: add policy for TIPC_NLA_NET_ADDR
net: validate attribute sizes in neigh_dump_table()
Finn Thain (8):
m68k/mac: Don't remap SWIM MMIO region
block/swim: Check drive type
block/swim: Don't log an error message for an invalid ioctl block/swim: Remove extra put_disk() call from error path block/swim: Rename macros to avoid inconsistent inverted logic block/swim: Select appropriate drive on device open block/swim: Fix array bounds check
block/swim: Fix IO error at end of medium
Greg Kroah-Hartman (3):
Revert "pinctrl: intel: Initialize GPIO properly when used through irqchip" Revert "mm/hmm: fix header file if/else/endif maze"
Linux 4.16.6
Guenter Roeck (2):
hwmon: (k10temp) Add temperature offset for Ryzen 2700X
hwmon: (k10temp) Add support for AMD Ryzen w/ Vega graphics
Guillaume Nault (6):
l2tp: check sockaddr length in pppol2tp_connect()
pppoe: check sockaddr length in pppoe_connect()
l2tp: hold reference on tunnels in netlink dumps
l2tp: hold reference on tunnels printed in pppol2tp proc file
l2tp: hold reference on tunnels printed in l2tp/tunnels debugfs file
l2tp: fix {pppol2tp, l2tp_dfs}_seq_stop() in case of seq_file overflow
Hans de Goede (1):
ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
Heiko Carstens (1):
s390/uprobes: implement arch_uretprobe_is_alive()
Igor Russkikh (2):
net: aquantia: Regression on reset with 1.x firmware
net: aquantia: oops when shutdown on already stopped device
Ivan Khoronzhuk (1):
net: ethernet: ti: cpsw: fix tx vlan priority mapping
James Bottomley (1):
tpm: add retry logic
Jann Horn (1):
tcp: don't read out-of-bounds opsize
Jason Wang (1):
virtio-net: add missing virtqueue kick when flushing packets
Jose Abreu (1):
net: stmmac: Disable ACS Feature for GMAC >= 4
Julian Wiedmann (3):
s390/qeth: fix error handling in adapter command callbacks s390/qeth: avoid control IO completion stalls s390/qeth: handle failure on workqueue creation
Karthikeyan Periyasamy (1):
Revert "ath10k: send (re)assoc peer command when NSS changed"
Martin K. Petersen (1):
scsi: mptsas: Disable WRITE SAME
Maxime Chevallier (1):
net: mvpp2: Fix DMA address mask size
Michael S. Tsirkin (2):
virtio_net: split out ctrl buffer
virtio_net: fix adding vids on big-endian
Neil Armstrong (1):
drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs
Olivier Gayot (1):
docs: ip-sysctl.txt: fix name of some ipv6 variables
Paolo Abeni (1):
team: avoid adding twice the same option to the event list
Pawel Dembicki (1):
net: qmi_wwan: add Wistron Neweb D19Q1
Paweł Jabłoński (1):
i40e: Fix attach VF to VM issue
Peter Xu (1):
tracing: Fix missing tab for hwlat_detector print format
Robert Kolchmeyer (1):
fsnotify: Fix fsnotify_mark_connector race
Ronak Doshi (1):
vmxnet3: fix incorrect dereference when rxvlan is disabled
Sebastian Ott (1):
s390/cio: update chpid descriptor after resource accessibility event
Soheil Hassas Yeganeh (1):
tcp: clear tp->packets_out when purging write queue
Stefan Haberland (1):
s390/dasd: fix IO error for newly defined devices
Stefan Hajnoczi (1):
VSOCK: make af_vsock.ko removable again
Tetsuo Handa (1):
commoncap: Handle memory allocation failure.
Thomas Richter (1):
kprobes: Fix random address output of blacklist file
Tom Lendacky (3):
amd-xgbe: Add pre/post auto-negotiation phy hooks
amd-xgbe: Improve KR auto-negotiation and training
amd-xgbe: Only use the SFP supported transceiver signals
Tomas Winkler (1):
tpm: cmd_ready command can be issued only after granting locality
Toshiaki Makita (1):
vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi
Ursula Braun (1):
net/smc: fix shutdown in state SMC_LISTEN
Vasundhara Volam (1):
bnxt_en: Fix memory fault in bnxt_ethtool_init()
Willem de Bruijn (1):
packet: fix bitfield update race
Winkler, Tomas (1):
tpm: tpm-interface: fix tpm_transmit/_cmd kdoc
Wolfgang Bumiller (1):
net: fix deadlock while clearing neighbor proxy table
Xin Long (3):
bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave
sctp: do not check port in sctp_inet6_cmp_addr
team: fix netconsole setup over team
Greg KH
maintainerDocumentation/networking/ip-sysctl.txt +4 -4
@@ -1386,26 +1386,26 @@ mld_qrv - INTEGER Default: 2 (as specified by RFC3810 9.1) Minimum: 1 (as specified by RFC6636 4.5) -max_dst_opts_cnt - INTEGER +max_dst_opts_number - INTEGER Maximum number of non-padding TLVs allowed in a Destination options extension header. If this value is less than zero then unknown options are disallowed and the number of known TLVs allowed is the absolute value of this number. Default: 8 -max_hbh_opts_cnt - INTEGER +max_hbh_opts_number - INTEGER Maximum number of non-padding TLVs allowed in a Hop-by-Hop options extension header. If this value is less than zero then unknown options are disallowed and the number of known TLVs allowed is the absolute value of this number. Default: 8 -max dst_opts_len - INTEGER +max_dst_opts_length - INTEGER Maximum length allowed for a Destination options extension header. Default: INT_MAX (unlimited) -max hbh_opts_len - INTEGER +max_hbh_length - INTEGER Maximum length allowed for a Hop-by-Hop options extension header. Default: INT_MAX (unlimited)
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 16 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = NAME = Fearless Coyote
arch/s390/kernel/perf_cpum_cf_events.c +4 -4
@@ -123,7 +123,7 @@ CPUMF_EVENT_ATTR(cf_zec12, L1I_OFFBOOK_L3_SOURCED_WRITES_IV, 0x00a1);CPUMF_EVENT_ATTR (cf_zec12,TX_NC_TABORT ,0x00b1 );CPUMF_EVENT_ATTR (cf_zec12,TX_C_TABORT_NO_SPECIAL ,0x00b2 );CPUMF_EVENT_ATTR (cf_zec12,TX_C_TABORT_SPECIAL ,0x00b3 ); -CPUMF_EVENT_ATTR (cf_z13,L1D_WRITES_RO_EXCL ,0x0080 ); +CPUMF_EVENT_ATTR (cf_z13,L1D_RO_EXCL_WRITES ,0x0080 );CPUMF_EVENT_ATTR (cf_z13,DTLB1_WRITES ,0x0081 );CPUMF_EVENT_ATTR (cf_z13,DTLB1_MISSES ,0x0082 );CPUMF_EVENT_ATTR (cf_z13,DTLB1_HPAGE_WRITES ,0x0083 );
@@ -179,7 +179,7 @@ CPUMF_EVENT_ATTR(cf_z13, TX_C_TABORT_NO_SPECIAL, 0x00db);CPUMF_EVENT_ATTR (cf_z13,TX_C_TABORT_SPECIAL ,0x00dc );CPUMF_EVENT_ATTR (cf_z13,MT_DIAG_CYCLES_ONE_THR_ACTIVE ,0x01c0 );CPUMF_EVENT_ATTR (cf_z13,MT_DIAG_CYCLES_TWO_THR_ACTIVE ,0x01c1 ); -CPUMF_EVENT_ATTR (cf_z14,L1D_WRITES_RO_EXCL ,0x0080 ); +CPUMF_EVENT_ATTR (cf_z14,L1D_RO_EXCL_WRITES ,0x0080 );CPUMF_EVENT_ATTR (cf_z14,DTLB2_WRITES ,0x0081 );CPUMF_EVENT_ATTR (cf_z14,DTLB2_MISSES ,0x0082 );CPUMF_EVENT_ATTR (cf_z14,DTLB2_HPAGE_WRITES ,0x0083 );
@@ -371,7 +371,7 @@ static struct attribute *cpumcf_zec12_pmu_event_attr[] __initdata = { };static struct attribute *cpumcf_z13_pmu_event_attr[]__initdata = { -CPUMF_EVENT_PTR (cf_z13,L1D_WRITES_RO_EXCL ), +CPUMF_EVENT_PTR (cf_z13,L1D_RO_EXCL_WRITES ),CPUMF_EVENT_PTR (cf_z13,DTLB1_WRITES ),CPUMF_EVENT_PTR (cf_z13,DTLB1_MISSES ),CPUMF_EVENT_PTR (cf_z13,DTLB1_HPAGE_WRITES ),
@@ -431,7 +431,7 @@ static struct attribute *cpumcf_z13_pmu_event_attr[] __initdata = { };static struct attribute *cpumcf_z14_pmu_event_attr[]__initdata = { -CPUMF_EVENT_PTR (cf_z14,L1D_WRITES_RO_EXCL ), +CPUMF_EVENT_PTR (cf_z14,L1D_RO_EXCL_WRITES ),CPUMF_EVENT_PTR (cf_z14,DTLB2_WRITES ),CPUMF_EVENT_PTR (cf_z14,DTLB2_MISSES ),CPUMF_EVENT_PTR (cf_z14,DTLB2_HPAGE_WRITES ),
arch/s390/kernel/uprobes.c +9 -0
@@ -150,6 +150,15 @@ unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline,return orig; } +bool arch_uretprobe_is_alive (struct return_instance *ret,enum rp_check ctx, +struct pt_regs *regs) +{ +if (ctx ==RP_CHECK_CHAIN_CALL ) +return user_stack_pointer (regs) <= ret->stack; +else +return user_stack_pointer (regs) < ret->stack; +} +/* Instruction Emulation */ static void adjust_psw_addr (psw_t *psw,unsigned long len)
drivers/acpi/acpi_video.c +25 -2
@@ -2123,6 +2123,25 @@ static int __init intel_opregion_present(void)return opregion; } +static bool dmi_is_desktop (void ) +{ +const char *chassis_type; + + chassis_type =dmi_get_system_info (DMI_CHASSIS_TYPE ); +if (!chassis_type) +return false; + +if (!strcmp (chassis_type,"3" ) ||/* 3: Desktop */ + !strcmp (chassis_type,"4" ) ||/* 4: Low Profile Desktop */ + !strcmp (chassis_type,"5" ) ||/* 5: Pizza Box */ + !strcmp (chassis_type,"6" ) ||/* 6: Mini Tower */ + !strcmp (chassis_type,"7" ) ||/* 7: Tower */ + !strcmp (chassis_type,"11" ))/* 11: Main Server Chassis */ +return true; + +return false; +} +int acpi_video_register (void ) {int ret =0 ;
@@ -2143,8 +2162,12 @@ int acpi_video_register(void)* win8 ready (where we also prefer the native backlight driver, so * normally the acpi_video code should not register there anyways). */ -if (only_lcd ==-1 ) - only_lcd =acpi_osi_is_win8 (); +if (only_lcd ==-1 ) { +if (dmi_is_desktop () &&acpi_osi_is_win8 ()) + only_lcd = true; +else + only_lcd = false; + }dmi_check_system (video_dmi_table);
drivers/block/swim.c +22 -27
149 lines not on this page · raw message
drivers/block/swim3.c +3 -3
@@ -148,7 +148,7 @@ struct swim3 {#define MOTOR_ON 2#define RELAX 3/* also eject in progress */ #define READ_DATA_0 4 -#define TWOMEG_DRIVE 5 +#define ONEMEG_DRIVE 5#define SINGLE_SIDED 6/* drive or diskette is 4MB type? */ #define DRIVE_PRESENT 7#define DISK_IN 8
@@ -156,9 +156,9 @@ struct swim3 {#define TRACK_ZERO 10#define TACHO 11#define READ_DATA_1 12 -#define MFM_MODE 13 +#define GCR_MODE 13#define SEEK_COMPLETE 14 -#define ONEMEG_MEDIA 15 +#define TWOMEG_MEDIA 15/* Definitions of values used in writing and formatting */ #define DATA_ESCAPE 0x99
drivers/cdrom/cdrom.c +1 -1
@@ -2374,7 +2374,7 @@ static int cdrom_ioctl_media_changed(struct cdrom_device_info *cdi,if (!CDROM_CAN (CDC_SELECT_DISC ) || arg ==CDSL_CURRENT )return media_changed (cdi,1 ); -if ((unsigned int )arg >= cdi->capacity) +if (arg >= cdi->capacity)return -EINVAL ; info =kmalloc (sizeof (*info),GFP_KERNEL );
drivers/char/tpm/tpm-interface.c +103 -28
172 lines not on this page · raw message
drivers/char/tpm/tpm.h +1 -0
@@ -108,6 +108,7 @@ enum tpm2_return_codes {TPM2_RC_COMMAND_CODE =0x0143 ,TPM2_RC_TESTING =0x090A ,/* RC_WARN */ TPM2_RC_REFERENCE_H0 =0x0910 , + TPM2_RC_RETRY = 0x0922, }; enum tpm2_algorithms {
drivers/char/tpm/tpm_crb.c +75 -33
192 lines not on this page · raw message
drivers/char/tpm/tpm_tis_core.c +3 -1
@@ -143,11 +143,13 @@ static bool check_locality(struct tpm_chip *chip, int l)return false; } -static void release_locality (struct tpm_chip *chip,int l) +static int release_locality (struct tpm_chip *chip,int l) {struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);tpm_tis_write8 (priv,TPM_ACCESS (l),TPM_ACCESS_ACTIVE_LOCALITY ); + +return 0 ; }static int request_locality (struct tpm_chip *chip,int l)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +3 -0
@@ -1637,6 +1637,8 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi)* (and possibly on the platform). So far only i.MX6Q (v1.30a) and * i.MX6DL (v1.31a) have been identified as needing the workaround, with * 4 and 1 iterations respectively. +* The Amlogic Meson GX SoCs (v2.01a) have been identified as needing +* the workaround with a single iteration. */ switch (hdmi->version) {
@@ -1644,6 +1646,7 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) count =4 ;break ;case 0x131a : +case 0x201a : count =1 ;break ;default :
drivers/hwmon/k10temp.c +14 -3
@@ -40,6 +40,10 @@ static DEFINE_MUTEX(nb_smu_ind_mutex);#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463#endif +#ifndef PCI_DEVICE_ID_AMD_17H_RR_NB +#define PCI_DEVICE_ID_AMD_17H_RR_NB 0x15d0 +#endif +/* CPUID function 0x80000001, ebx */ #define CPUID_PKGTYPE_MASK 0xf0000000#define CPUID_PKGTYPE_F 0x00000000
@@ -72,6 +76,7 @@ struct k10temp_data {struct pci_dev *pdev;void (*read_tempreg)(struct pci_dev *pdev,u32 *regval);int temp_offset; +u32 temp_adjust_mask; };struct tctl_offset {
@@ -84,6 +89,7 @@ static const struct tctl_offset tctl_offset_table[] = { { 0x17, "AMD Ryzen 5 1600X", 20000 }, { 0x17, "AMD Ryzen 7 1700X", 20000 }, { 0x17, "AMD Ryzen 7 1800X", 20000 }, + { 0x17, "AMD Ryzen 7 2700X", 10000 }, { 0x17, "AMD Ryzen Threadripper 1950X", 27000 }, { 0x17, "AMD Ryzen Threadripper 1920X", 27000 }, { 0x17, "AMD Ryzen Threadripper 1900X", 27000 },
@@ -129,6 +135,8 @@ static ssize_t temp1_input_show(struct device *dev, data->read_tempreg (data->pdev, ®val); temp = (regval >>21 ) *125 ; +if (regval & data->temp_adjust_mask) + temp -=49000 ;if (temp > data->temp_offset) temp -= data->temp_offset;else
@@ -259,12 +267,14 @@ static int k10temp_probe(struct pci_dev *pdev, data->pdev = pdev;if (boot_cpu_data.x86 ==0x15 && (boot_cpu_data.x86_model ==0x60 || - boot_cpu_data.x86_model ==0x70 )) + boot_cpu_data.x86_model ==0x70 )) { data->read_tempreg = read_tempreg_nb_f15; -else if (boot_cpu_data.x86 ==0x17 ) + }else if (boot_cpu_data.x86 ==0x17 ) { + data->temp_adjust_mask =0x80000 ; data->read_tempreg = read_tempreg_nb_f17; -else + }else { data->read_tempreg = read_tempreg_pci; + }for (i =0 ; i <ARRAY_SIZE (tctl_offset_table); i++) {const struct tctl_offset *entry = &tctl_offset_table[i];
@@ -292,6 +302,7 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_RR_NB) }, {} };MODULE_DEVICE_TABLE (pci, k10temp_id_table);
drivers/message/fusion/mptsas.c +1 -0
@@ -1994,6 +1994,7 @@ static struct scsi_host_template mptsas_driver_template = { .cmd_per_lun = 7, .use_clustering = ENABLE_CLUSTERING, .shost_attrs = mptscsih_host_attrs, + .no_write_same = 1, };static int mptsas_get_linkerrors (struct sas_phy *phy)
drivers/net/bonding/bond_main.c +1 -2
@@ -1660,8 +1660,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, }/* switch(bond_mode) */ #ifdef CONFIG_NET_POLL_CONTROLLER - slave_dev->npinfo = bond->dev->npinfo; -if (slave_dev->npinfo) { +if (bond->dev->npinfo) {if (slave_enable_netpoll (new_slave)) {netdev_info (bond_dev,"master_dev is using netpoll, but new slave device does not support netpoll\n" ); res = -EBUSY ;
drivers/net/ethernet/amd/xgbe/xgbe-common.h +8 -0
@@ -1321,6 +1321,10 @@#define MDIO_VEND2_AN_STAT 0x8002#endif +#ifndef MDIO_VEND2_PMA_CDR_CONTROL +#define MDIO_VEND2_PMA_CDR_CONTROL 0x8056 +#endif +#ifndef MDIO_CTRL1_SPEED1G #define MDIO_CTRL1_SPEED1G (MDIO_CTRL1_SPEED10G & ~BMCR_SPEED100)#endif
@@ -1369,6 +1373,10 @@#define XGBE_AN_CL37_TX_CONFIG_MASK 0x08#define XGBE_AN_CL37_MII_CTRL_8BIT 0x0100 +#define XGBE_PMA_CDR_TRACK_EN_MASK 0x01 +#define XGBE_PMA_CDR_TRACK_EN_OFF 0x00 +#define XGBE_PMA_CDR_TRACK_EN_ON 0x01 +/* Bit setting and getting macros * The get macro will extract the current bit field value from within * the variable
drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c +16 -0
@@ -519,6 +519,22 @@ void xgbe_debugfs_init(struct xgbe_prv_data *pdata) "debugfs_create_file failed\n"); } +if (pdata->vdata->an_cdr_workaround) { + pfile =debugfs_create_bool ("an_cdr_workaround" ,0600 , + pdata->xgbe_debugfs, + &pdata->debugfs_an_cdr_workaround); +if (!pfile) +netdev_err (pdata->netdev, +"debugfs_create_bool failed\n" ); + + pfile =debugfs_create_bool ("an_cdr_track_early" ,0600 , + pdata->xgbe_debugfs, + &pdata->debugfs_an_cdr_track_early); +if (!pfile) +netdev_err (pdata->netdev, +"debugfs_create_bool failed\n" ); + } +kfree (buf); }
drivers/net/ethernet/amd/xgbe/xgbe-main.c +1 -0
@@ -349,6 +349,7 @@ int xgbe_config_netdev(struct xgbe_prv_data *pdata)XGMAC_SET_BITS (pdata->rss_options,MAC_RSSCR ,UDP4TE ,1 );/* Call MDIO/PHY initialization routine */ + pdata->debugfs_an_cdr_workaround = pdata->vdata->an_cdr_workaround; ret = pdata->phy_if.phy_init (pdata);if (ret)return ret;
drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +19 -5
@@ -432,11 +432,16 @@ static void xgbe_an73_disable(struct xgbe_prv_data *pdata)xgbe_an73_set (pdata, false, false);xgbe_an73_disable_interrupts (pdata); + pdata->an_start =0 ; +netif_dbg (pdata, link, pdata->netdev,"CL73 AN disabled\n" ); }static void xgbe_an_restart (struct xgbe_prv_data *pdata) { +if (pdata->phy_if.phy_impl.an_pre) + pdata->phy_if.phy_impl.an_pre (pdata); +switch (pdata->an_mode) {case XGBE_AN_MODE_CL73 :case XGBE_AN_MODE_CL73_REDRV :
@@ -453,6 +458,9 @@ static void xgbe_an_restart(struct xgbe_prv_data *pdata)static void xgbe_an_disable (struct xgbe_prv_data *pdata) { +if (pdata->phy_if.phy_impl.an_post) + pdata->phy_if.phy_impl.an_post (pdata); +switch (pdata->an_mode) {case XGBE_AN_MODE_CL73 :case XGBE_AN_MODE_CL73_REDRV :
@@ -505,11 +513,11 @@ static enum xgbe_an xgbe_an73_tx_training(struct xgbe_prv_data *pdata,XMDIO_WRITE (pdata,MDIO_MMD_PMAPMD ,MDIO_PMA_10GBR_PMD_CTRL , reg); -if (pdata->phy_if.phy_impl.kr_training_post) - pdata->phy_if.phy_impl.kr_training_post (pdata); -netif_dbg (pdata, link, pdata->netdev,"KR training initiated\n" ); + +if (pdata->phy_if.phy_impl.kr_training_post) + pdata->phy_if.phy_impl.kr_training_post (pdata); }return XGBE_AN_PAGE_RECEIVED ;
@@ -637,11 +645,11 @@ static enum xgbe_an xgbe_an73_incompat_link(struct xgbe_prv_data *pdata)return XGBE_AN_NO_LINK ; } -xgbe_an73_disable (pdata); +xgbe_an_disable (pdata);xgbe_switch_mode (pdata); -xgbe_an73_restart (pdata); +xgbe_an_restart (pdata);return XGBE_AN_INCOMPAT_LINK ; }
@@ -820,6 +828,9 @@ static void xgbe_an37_state_machine(struct xgbe_prv_data *pdata) pdata->an_result = pdata->an_state; pdata->an_state =XGBE_AN_READY ; +if (pdata->phy_if.phy_impl.an_post) + pdata->phy_if.phy_impl.an_post (pdata); +netif_dbg (pdata, link, pdata->netdev,"CL37 AN result: %s\n" ,xgbe_state_as_string (pdata->an_result)); }
@@ -903,6 +914,9 @@ static void xgbe_an73_state_machine(struct xgbe_prv_data *pdata) pdata->kx_state =XGBE_RX_BPA ; pdata->an_start =0 ; +if (pdata->phy_if.phy_impl.an_post) + pdata->phy_if.phy_impl.an_post (pdata); +netif_dbg (pdata, link, pdata->netdev,"CL73 AN result: %s\n" ,xgbe_state_as_string (pdata->an_result)); }
drivers/net/ethernet/amd/xgbe/xgbe-pci.c +2 -0
@@ -456,6 +456,7 @@ static const struct xgbe_version_data xgbe_v2a = { .irq_reissue_support = 1, .tx_desc_prefetch = 5, .rx_desc_prefetch = 5, + .an_cdr_workaround = 1, };static const struct xgbe_version_data xgbe_v2b = {
@@ -470,6 +471,7 @@ static const struct xgbe_version_data xgbe_v2b = { .irq_reissue_support = 1, .tx_desc_prefetch = 5, .rx_desc_prefetch = 5, + .an_cdr_workaround = 1, };static const struct pci_device_id xgbe_pci_table[] = {
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +178 -18
279 lines not on this page · raw message
drivers/net/ethernet/amd/xgbe/xgbe.h +9 -0
@@ -833,6 +833,7 @@ struct xgbe_hw_if {/* This structure represents implementation specific routines for an * implementation of a PHY. All routines are required unless noted below. * Optional routines: +* an_pre, an_post * kr_training_pre, kr_training_post */ struct xgbe_phy_impl_if {
@@ -875,6 +876,10 @@ struct xgbe_phy_impl_if {/* Process results of auto-negotiation */ enum xgbe_mode (*an_outcome)(struct xgbe_prv_data *); +/* Pre/Post auto-negotiation support */ +void (*an_pre)(struct xgbe_prv_data *); +void (*an_post)(struct xgbe_prv_data *); +/* Pre/Post KR training enablement support */ void (*kr_training_pre)(struct xgbe_prv_data *);void (*kr_training_post)(struct xgbe_prv_data *);
@@ -989,6 +994,7 @@ struct xgbe_version_data {unsigned int irq_reissue_support;unsigned int tx_desc_prefetch;unsigned int rx_desc_prefetch; +unsigned int an_cdr_workaround; };struct xgbe_vxlan_data {
@@ -1257,6 +1263,9 @@ struct xgbe_prv_data {unsigned int debugfs_xprop_reg;unsigned int debugfs_xi2c_reg; + +bool debugfs_an_cdr_workaround; +bool debugfs_an_cdr_track_early; };/* Function prototypes*/
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +5 -3
@@ -951,9 +951,11 @@ void aq_nic_shutdown(struct aq_nic_s *self)netif_device_detach (self->ndev); - err =aq_nic_stop (self); -if (err <0 ) - goto err_exit; +if (netif_running (self->ndev)) { + err =aq_nic_stop (self); +if (err <0 ) + goto err_exit; + }aq_nic_deinit (self); err_exit:
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +16 -0
@@ -48,6 +48,8 @@#define FORCE_FLASHLESS 0static int hw_atl_utils_ver_match (u32 ver_expected,u32 ver_actual); +static int hw_atl_utils_mpi_set_state (struct aq_hw_s *self, +enum hal_atl_utils_fw_state_e state);int hw_atl_utils_initfw (struct aq_hw_s *self,const struct aq_fw_ops **fw_ops) {
@@ -247,6 +249,20 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self) self->rbl_enabled = (boot_exit_code !=0 ); +/* FW 1.x may bootup in an invalid POWER state (WOL feature). +* We should work around this by forcing its state back to DEINIT +*/ +if (!hw_atl_utils_ver_match (HW_ATL_FW_VER_1X , +aq_hw_read_reg (self, +HW_ATL_MPI_FW_VERSION ))) { +int err =0 ; + +hw_atl_utils_mpi_set_state (self,MPI_DEINIT ); +AQ_HW_WAIT_FOR ((aq_hw_read_reg (self,HW_ATL_MPI_STATE_ADR ) & +HW_ATL_MPI_STATE_MSK ) ==MPI_DEINIT , +10 ,1000U ); + } +if (self->rbl_enabled)return hw_atl_utils_soft_reset_rbl (self);else
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +27 -22
71 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h +0 -2
@@ -59,8 +59,6 @@ enum bnxt_nvm_directory_type {#define BNX_DIR_ATTR_NO_CHKSUM (1 << 0)#define BNX_DIR_ATTR_PROP_STREAM (1 << 1) -#define BNX_PKG_LOG_MAX_LENGTH 4096 -enum bnxnvm_pkglog_field_index {BNX_PKG_LOG_FIELD_IDX_INSTALLED_TIMESTAMP =0 ,BNX_PKG_LOG_FIELD_IDX_PKG_DESCRIPTION =1 ,
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +11 -0
@@ -2889,6 +2889,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)int ret =0 ;struct hlist_node *h;int bkt; +u8 i;/* validate the request */ if (vf_id >= pf->num_alloc_vfs) {
@@ -2900,6 +2901,16 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) vf = &(pf->vf[vf_id]); vsi = pf->vsi[vf->lan_vsi_idx]; + +/* When the VF is resetting wait until it is done. +* It can take up to 200 milliseconds, +* but wait for up to 300 milliseconds to be safe. +*/ +for (i =0 ; i <15 ; i++) { +if (test_bit (I40E_VF_STATE_INIT , &vf->vf_states)) +break ; +msleep (20 ); + }if (!test_bit (I40E_VF_STATE_INIT , &vf->vf_states)) {dev_err (&pf->pdev->dev,"VF %d still in reset. Try again.\n" , vf_id);
drivers/net/ethernet/marvell/mvpp2.c +7 -5
@@ -838,6 +838,8 @@ enum mvpp2_bm_type {#define MVPP2_MIB_COUNTERS_STATS_DELAY (1 * HZ) +#define MVPP2_DESC_DMA_MASK DMA_BIT_MASK(40) +/* Definitions */ /* Shared Packet Processor resources */
@@ -1336,7 +1338,7 @@ static dma_addr_t mvpp2_txdesc_dma_addr_get(struct mvpp2_port *port,if (port->priv->hw_version ==MVPP21 )return tx_desc->pp21.buf_dma_addr;else -return tx_desc->pp22.buf_dma_addr_ptp &GENMASK_ULL (40 ,0 ); +return tx_desc->pp22.buf_dma_addr_ptp &MVPP2_DESC_DMA_MASK ; } static void mvpp2_txdesc_dma_addr_set(struct mvpp2_port *port,
@@ -1354,7 +1356,7 @@ static void mvpp2_txdesc_dma_addr_set(struct mvpp2_port *port, }else {u64 val = (u64 )addr; - tx_desc->pp22.buf_dma_addr_ptp &= ~GENMASK_ULL (40 ,0 ); + tx_desc->pp22.buf_dma_addr_ptp &= ~MVPP2_DESC_DMA_MASK ; tx_desc->pp22.buf_dma_addr_ptp |= val; tx_desc->pp22.packet_offset = offset; }
@@ -1414,7 +1416,7 @@ static dma_addr_t mvpp2_rxdesc_dma_addr_get(struct mvpp2_port *port,if (port->priv->hw_version ==MVPP21 )return rx_desc->pp21.buf_dma_addr;else -return rx_desc->pp22.buf_dma_addr_key_hash &GENMASK_ULL (40 ,0 ); +return rx_desc->pp22.buf_dma_addr_key_hash &MVPP2_DESC_DMA_MASK ; } static unsigned long mvpp2_rxdesc_cookie_get(struct mvpp2_port *port,
@@ -1423,7 +1425,7 @@ static unsigned long mvpp2_rxdesc_cookie_get(struct mvpp2_port *port,if (port->priv->hw_version ==MVPP21 )return rx_desc->pp21.buf_cookie;else -return rx_desc->pp22.buf_cookie_misc &GENMASK_ULL (40 ,0 ); +return rx_desc->pp22.buf_cookie_misc &MVPP2_DESC_DMA_MASK ; } static size_t mvpp2_rxdesc_size_get(struct mvpp2_port *port,
@@ -8347,7 +8349,7 @@ static int mvpp2_probe(struct platform_device *pdev) }if (priv->hw_version ==MVPP22 ) { - err =dma_set_mask (&pdev->dev,DMA_BIT_MASK (40 )); + err =dma_set_mask (&pdev->dev,MVPP2_DESC_DMA_MASK );if (err) goto err_mg_clk;/* Sadly, the BM pools all share the same register to
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +1 -1
@@ -343,7 +343,7 @@ enum power_event {#define MTL_RX_OVERFLOW_INT BIT(16)/* Default operating mode of the MAC */ -#define GMAC_CORE_INIT (GMAC_CONFIG_JD | GMAC_CONFIG_PS | GMAC_CONFIG_ACS | \ +#define GMAC_CORE_INIT (GMAC_CONFIG_JD | GMAC_CONFIG_PS | \ GMAC_CONFIG_BE | GMAC_CONFIG_DCRS)/* To dump the core regs excluding the Address Registers */
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +0 -7
@@ -30,13 +30,6 @@ static void dwmac4_core_init(struct mac_device_info *hw, value |=GMAC_CORE_INIT ; -/* Clear ACS bit because Ethernet switch tagging formats such as -* Broadcom tags can look like invalid LLC/SNAP packets and cause the -* hardware to truncate packets on reception. -*/ -if (netdev_uses_dsa (dev)) - value &= ~GMAC_CONFIG_ACS ; -if (mtu >1500 ) value |=GMAC_CONFIG_2K ;if (mtu >2000 )
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +6 -1
@@ -3435,8 +3435,13 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)/* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3 * Type frames (LLC/LLC-SNAP) +* +* llc_snap is never checked in GMAC >= 4, so this ACS +* feature is always disabled and packets need to be +* stripped manually. */ -if (unlikely (status != llc_snap)) +if (unlikely (priv->synopsys_id >=DWMAC_CORE_4_00 ) || +unlikely (status != llc_snap)) frame_len -=ETH_FCS_LEN ;if (netif_msg_rx_status (priv)) {
drivers/net/ethernet/ti/cpsw.c +1 -1
@@ -125,7 +125,7 @@ do { \#define RX_PRIORITY_MAPPING 0x76543210#define TX_PRIORITY_MAPPING 0x33221100 -#define CPDMA_TX_PRIORITY_MAP 0x01234567 +#define CPDMA_TX_PRIORITY_MAP 0x76543210#define CPSW_VLAN_AWARE BIT(1)#define CPSW_ALE_VLAN_AWARE 1
drivers/net/macsec.c +2 -3
@@ -3277,7 +3277,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev, err =netdev_upper_dev_link (real_dev, dev, extack);if (err <0 ) - goto put_dev; + goto unregister;/* need to be already registered so that ->init has run and * the MAC addr is set
@@ -3316,8 +3316,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev,macsec_del_dev (macsec); unlink:netdev_upper_dev_unlink (real_dev, dev); -put_dev: -dev_put (real_dev); +unregister:unregister_netdevice (dev);return err; }
drivers/net/ppp/pppoe.c +4 -0
@@ -620,6 +620,10 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,lock_sock (sk); error = -EINVAL ; + +if (sockaddr_len !=sizeof (struct sockaddr_pppox )) + goto end; +if (sp->sa_protocol !=PX_PROTO_OE ) goto end;
drivers/net/team/team.c +31 -7
@@ -261,6 +261,17 @@ static void __team_option_inst_mark_removed_port(struct team *team, } } +static bool __team_option_inst_tmp_find (const struct list_head *opts, +const struct team_option_inst *needle) +{ +struct team_option_inst *opt_inst; + +list_for_each_entry (opt_inst, opts, tmp_list) +if (opt_inst == needle) +return true; +return false; +} +static int __team_options_register (struct team *team,const struct team_option *option,size_t option_count)
@@ -1061,14 +1072,11 @@ static void team_port_leave(struct team *team, struct team_port *port) }#ifdef CONFIG_NET_POLL_CONTROLLER -static int team_port_enable_netpoll (struct team *team,struct team_port *port) +static int __team_port_enable_netpoll (struct team_port *port) {struct netpoll *np;int err; -if (!team->dev->npinfo) -return 0 ; - np =kzalloc (sizeof (*np),GFP_KERNEL );if (!np)return -ENOMEM ;
@@ -1082,6 +1090,14 @@ static int team_port_enable_netpoll(struct team *team, struct team_port *port)return err; } +static int team_port_enable_netpoll (struct team_port *port) +{ +if (!port->team->dev->npinfo) +return 0 ; + +return __team_port_enable_netpoll (port); +} +static void team_port_disable_netpoll (struct team_port *port) {struct netpoll *np = port->np;
@@ -1096,7 +1112,7 @@ static void team_port_disable_netpoll(struct team_port *port) kfree(np); }#else -static int team_port_enable_netpoll (struct team *team,struct team_port *port) +static int team_port_enable_netpoll (struct team_port *port) {return 0 ; }
@@ -1204,7 +1220,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev) goto err_vids_add; } - err =team_port_enable_netpoll (team, port); + err =team_port_enable_netpoll (port);if (err) {netdev_err (dev,"Failed to enable netpoll on device %s\n" , portname);
@@ -1901,7 +1917,7 @@ static int team_netpoll_setup(struct net_device *dev,mutex_lock (&team->lock);list_for_each_entry (port, &team->port_list, list) { - err =team_port_enable_netpoll (team, port); + err =__team_port_enable_netpoll (port);if (err) {__team_netpoll_cleanup (team);break ;
@@ -2562,6 +2578,14 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)if (err) goto team_put; opt_inst->changed = true; + +/* dumb/evil user-space can send us duplicate opt, +* keep only the last one +*/ +if (__team_option_inst_tmp_find (&opt_inst_list, + opt_inst)) +continue ; +list_add (&opt_inst->tmp_list, &opt_inst_list); }if (!opt_found) {
drivers/net/tun.c +1 -6
@@ -1094,12 +1094,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) goto drop; len =run_ebpf_filter (tun, skb, len); - -/* Trim extra bytes since we may insert vlan proto & TCI -* in tun_put_user(). -*/ - len -=skb_vlan_tag_present (skb) ?sizeof (struct veth ) :0 ; -if (len <=0 ||pskb_trim (skb, len)) +if (len ==0 ||pskb_trim (skb, len)) goto drop;if (unlikely (skb_orphan_frags_rx (skb,GFP_ATOMIC )))
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1107,6 +1107,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x1435, 0xd181, 3)}, /* Wistron NeWeb D18Q1 */ {QMI_FIXED_INTF(0x1435, 0xd181, 4)}, /* Wistron NeWeb D18Q1 */ {QMI_FIXED_INTF(0x1435, 0xd181, 5)}, /* Wistron NeWeb D18Q1 */ + {QMI_FIXED_INTF(0x1435, 0xd191, 4)}, /* Wistron NeWeb D19Q1 */ {QMI_FIXED_INTF(0x16d8, 0x6003, 0)}, /* CMOTech 6003 */ {QMI_FIXED_INTF(0x16d8, 0x6007, 0)}, /* CMOTech CHE-628S */ {QMI_FIXED_INTF(0x16d8, 0x6008, 0)}, /* CMOTech CMU-301 */
drivers/net/virtio_net.c +48 -31
188 lines not on this page · raw message
drivers/net/vmxnet3/vmxnet3_drv.c +13 -4
@@ -1218,6 +1218,7 @@ vmxnet3_get_hdr_len(struct vmxnet3_adapter *adapter, struct sk_buff *skb,union {void *ptr;struct ethhdr *eth; +struct vlan_ethhdr *veth;struct iphdr *ipv4;struct ipv6hdr *ipv6;struct tcphdr *tcp;
@@ -1228,16 +1229,24 @@ vmxnet3_get_hdr_len(struct vmxnet3_adapter *adapter, struct sk_buff *skb,if (unlikely (sizeof (struct iphdr ) +sizeof (struct tcphdr ) > maplen))return 0 ; +if (skb->protocol ==cpu_to_be16 (ETH_P_8021Q ) || + skb->protocol ==cpu_to_be16 (ETH_P_8021AD )) + hlen =sizeof (struct vlan_ethhdr ); +else + hlen =sizeof (struct ethhdr ); + hdr.eth =eth_hdr (skb);if (gdesc->rcd.v4) { -BUG_ON (hdr.eth->h_proto !=htons (ETH_P_IP )); - hdr.ptr +=sizeof (struct ethhdr ); +BUG_ON (hdr.eth->h_proto !=htons (ETH_P_IP ) && + hdr.veth->h_vlan_encapsulated_proto !=htons (ETH_P_IP )); + hdr.ptr += hlen;BUG_ON (hdr.ipv4->protocol !=IPPROTO_TCP ); hlen = hdr.ipv4->ihl <<2 ; hdr.ptr += hdr.ipv4->ihl <<2 ; }else if (gdesc->rcd.v6) { -BUG_ON (hdr.eth->h_proto !=htons (ETH_P_IPV6 )); - hdr.ptr +=sizeof (struct ethhdr ); +BUG_ON (hdr.eth->h_proto !=htons (ETH_P_IPV6 ) && + hdr.veth->h_vlan_encapsulated_proto !=htons (ETH_P_IPV6 )); + hdr.ptr += hlen;/* Use an estimated value, since we also need to handle * TSO case. */
drivers/net/vmxnet3/vmxnet3_int.h +2 -2
@@ -69,10 +69,10 @@/* * Version numbers */ -#define VMXNET3_DRIVER_VERSION_STRING "1.4.13.0-k" +#define VMXNET3_DRIVER_VERSION_STRING "1.4.14.0-k"/* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ -#define VMXNET3_DRIVER_VERSION_NUM 0x01040d00 +#define VMXNET3_DRIVER_VERSION_NUM 0x01040e00#if defined(CONFIG_PCI_MSI )/* RSS only makes sense if MSI-X is supported. */
drivers/net/wireless/ath/ath10k/mac.c +2 -3
@@ -6028,9 +6028,8 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk) sta->addr, smps, err); } -if (changed &IEEE80211_RC_SUPP_RATES_CHANGED || - changed &IEEE80211_RC_NSS_CHANGED ) { -ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac update sta %pM supp rates/nss\n" , +if (changed &IEEE80211_RC_SUPP_RATES_CHANGED ) { +ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac update sta %pM supp rates\n" , sta->addr); err =ath10k_station_assoc (ar, arvif->vif, sta, true);
drivers/pinctrl/intel/pinctrl-intel.c +8 -15
@@ -425,18 +425,6 @@ static void __intel_gpio_set_direction(void __iomem *padcfg0, bool input)writel (value, padcfg0); } -static void intel_gpio_set_gpio_mode (void __iomem *padcfg0) -{ -u32 value; - -/* Put the pad into GPIO mode */ - value =readl (padcfg0) & ~PADCFG0_PMODE_MASK ; -/* Disable SCI/SMI/NMI generation */ - value &= ~(PADCFG0_GPIROUTIOXAPIC |PADCFG0_GPIROUTSCI ); - value &= ~(PADCFG0_GPIROUTSMI |PADCFG0_GPIROUTNMI ); -writel (value, padcfg0); -} -static int intel_gpio_request_enable (struct pinctrl_dev *pctldev,struct pinctrl_gpio_range *range,unsigned pin)
@@ -444,6 +432,7 @@ static int intel_gpio_request_enable(struct pinctrl_dev *pctldev,struct intel_pinctrl *pctrl =pinctrl_dev_get_drvdata (pctldev);void __iomem *padcfg0;unsigned long flags; +u32 value;raw_spin_lock_irqsave (&pctrl->lock, flags);
@@ -453,7 +442,13 @@ static int intel_gpio_request_enable(struct pinctrl_dev *pctldev, } padcfg0 =intel_get_padcfg (pctrl, pin,PADCFG0 ); -intel_gpio_set_gpio_mode (padcfg0); +/* Put the pad into GPIO mode */ + value =readl (padcfg0) & ~PADCFG0_PMODE_MASK ; +/* Disable SCI/SMI/NMI generation */ + value &= ~(PADCFG0_GPIROUTIOXAPIC |PADCFG0_GPIROUTSCI ); + value &= ~(PADCFG0_GPIROUTSMI |PADCFG0_GPIROUTNMI ); +writel (value, padcfg0); +/* Disable TX buffer and enable RX (this will be input) */ __intel_gpio_set_direction (padcfg0, true);
@@ -973,8 +968,6 @@ static int intel_gpio_irq_type(struct irq_data *d, unsigned type)raw_spin_lock_irqsave (&pctrl->lock, flags); -intel_gpio_set_gpio_mode (reg); - value =readl (reg); value &= ~(PADCFG0_RXEVCFG_MASK |PADCFG0_RXINV );
drivers/s390/block/dasd_alias.c +11 -2
@@ -592,13 +592,22 @@ static int _schedule_lcu_update(struct alias_lcu *lcu,int dasd_alias_add_device (struct dasd_device *device) {struct dasd_eckd_private *private = device->private; -struct alias_lcu *lcu; +__u8 uaddr = private->uid.real_unit_addr; +struct alias_lcu *lcu = private->lcu;unsigned long flags;int rc; - lcu = private->lcu; rc =0 ;spin_lock_irqsave (&lcu->lock, flags); +/* +* Check if device and lcu type differ. If so, the uac data may be +* outdated and needs to be updated. +*/ +if (private->uid.type != lcu->uac->unit[uaddr].ua_type) { + lcu->flags |=UPDATE_PENDING ; +DBF_DEV_EVENT (DBF_WARNING , device,"%s" , +"uid type mismatch - trigger rescan" ); + }if (!(lcu->flags &UPDATE_PENDING )) { rc =_add_device_to_lcu (lcu, device, device);if (rc)
drivers/s390/cio/chsc.c +11 -3
@@ -452,6 +452,7 @@ static void chsc_process_sei_link_incident(struct chsc_sei_nt0_area *sei_area)static void chsc_process_sei_res_acc (struct chsc_sei_nt0_area *sei_area) { +struct channel_path *chp;struct chp_link link;struct chp_id chpid;int status;
@@ -464,10 +465,17 @@ static void chsc_process_sei_res_acc(struct chsc_sei_nt0_area *sei_area) chpid.id = sei_area->rsid;/* allocate a new channel path structure, if needed */ status =chp_get_status (chpid); -if (status <0 ) -chp_new (chpid); -else if (!status) +if (!status)return ; + +if (status <0 ) { +chp_new (chpid); + }else { + chp =chpid_to_chp (chpid); +mutex_lock (&chp->lock); +chp_update_desc (chp); +mutex_unlock (&chp->lock); + }memset (&link,0 ,sizeof (struct chp_link )); link.chpid = chpid;if ((sei_area->vf &0xc0 ) !=0 ) {
drivers/s390/net/qeth_core.h +0 -2
@@ -565,7 +565,6 @@ enum qeth_ip_types {enum qeth_cmd_buffer_state {BUF_STATE_FREE ,BUF_STATE_LOCKED , -BUF_STATE_PROCESSED , };enum qeth_cq {
@@ -609,7 +608,6 @@ struct qeth_channel {struct qeth_cmd_buffer iob[QETH_CMD_BUFFER_NO ];atomic_t irq_pending;int io_buf_no; -int buf_no; };/**
drivers/s390/net/qeth_core_main.c +49 -66
268 lines not on this page · raw message
include/linux/fsnotify_backend.h +1 -3
@@ -217,12 +217,10 @@ struct fsnotify_mark_connector {union {/* Object pointer [lock] */ struct inode *inode;struct vfsmount *mnt; - }; -union { -struct hlist_head list;/* Used listing heads to free after srcu period expires */ struct fsnotify_mark_connector *destroy_next; }; +struct hlist_head list; };/*
include/linux/hmm.h +8 -1
@@ -498,16 +498,23 @@ struct hmm_device {struct hmm_device *hmm_device_new (void *drvdata);void hmm_device_put (struct hmm_device *hmm_device);#endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */ +#endif /* IS_ENABLED(CONFIG_HMM) */ /* Below are for HMM internal use only! Not to be used by device driver! */ +#if IS_ENABLED (CONFIG_HMM_MIRROR )void hmm_mm_destroy (struct mm_struct *mm);static inline void hmm_mm_init (struct mm_struct *mm) { mm->hmm =NULL ; } +#else /* IS_ENABLED(CONFIG_HMM_MIRROR) */ +static inline void hmm_mm_destroy (struct mm_struct *mm) {} +static inline void hmm_mm_init (struct mm_struct *mm) {} +#endif /* IS_ENABLED(CONFIG_HMM_MIRROR) */ + +#else /* IS_ENABLED(CONFIG_HMM) */ static inline void hmm_mm_destroy (struct mm_struct *mm) {}static inline void hmm_mm_init (struct mm_struct *mm) {} -#endif /* IS_ENABLED(CONFIG_HMM) */ #endif /* LINUX_HMM_H */
include/linux/if_vlan.h +5 -2
@@ -639,7 +639,7 @@ static inline bool skb_vlan_tagged(const struct sk_buff *skb)* Returns true if the skb is tagged with multiple vlan headers, regardless * of whether it is hardware accelerated or not. */ -static inline bool skb_vlan_tagged_multi (const struct sk_buff *skb) +static inline bool skb_vlan_tagged_multi (struct sk_buff *skb) {__be16 protocol = skb->protocol;
@@ -649,6 +649,9 @@ static inline bool skb_vlan_tagged_multi(const struct sk_buff *skb)if (likely (!eth_type_vlan (protocol)))return false; +if (unlikely (!pskb_may_pull (skb,VLAN_ETH_HLEN ))) +return false; + veh = (struct vlan_ethhdr *)skb->data; protocol = veh->h_vlan_encapsulated_proto; }
@@ -666,7 +669,7 @@ static inline bool skb_vlan_tagged_multi(const struct sk_buff *skb)* * Returns features without unsafe ones if the skb has multiple tags. */ -static inline netdev_features_t vlan_features_check (const struct sk_buff *skb, +static inline netdev_features_t vlan_features_check (struct sk_buff *skb,netdev_features_t features) {if (skb_vlan_tagged_multi (skb)) {
include/linux/tpm.h +1 -1
@@ -44,7 +44,7 @@ struct tpm_class_ops {bool (*update_timeouts)(struct tpm_chip *chip,unsigned long *timeout_cap);int (*request_locality)(struct tpm_chip *chip,int loc); -void (*relinquish_locality)(struct tpm_chip *chip,int loc); +int (*relinquish_locality)(struct tpm_chip *chip,int loc);void (*clk_enable)(struct tpm_chip *chip,bool value); };
include/net/ife.h +2 -1
@@ -12,7 +12,8 @@void *ife_encode (struct sk_buff *skb,u16 metalen);void *ife_decode (struct sk_buff *skb,u16 *metalen); -void *ife_tlv_meta_decode (void *skbdata,u16 *attrtype,u16 *dlen,u16 *totlen); +void *ife_tlv_meta_decode (void *skbdata,const void *ifehdr_end,u16 *attrtype, +u16 *dlen,u16 *totlen);int ife_tlv_meta_encode (void *skbdata,u16 attrtype,u16 dlen,const void *dval);
include/net/llc_conn.h +1 -0
@@ -97,6 +97,7 @@ static __inline__ char llc_backlog_type(struct sk_buff *skb)struct sock *llc_sk_alloc (struct net *net,int family,gfp_t priority,struct proto *prot,int kern); +void llc_sk_stop_all_timers (struct sock *sk,bool sync);void llc_sk_free (struct sock *sk);void llc_sk_reset (struct sock *sk);
kernel/kprobes.c +1 -1
@@ -2428,7 +2428,7 @@ static int kprobe_blacklist_seq_show(struct seq_file *m, void *v)struct kprobe_blacklist_entry *ent = list_entry(v, struct kprobe_blacklist_entry, list); -seq_printf (m,"0x%p-0x%p\t%ps\n" , (void *)ent->start_addr, +seq_printf (m,"0x%px-0x%px\t%ps\n" , (void *)ent->start_addr, (void *)ent->end_addr, (void *)ent->start_addr);return 0 ; }
kernel/trace/trace_entries.h +1 -1
@@ -356,7 +356,7 @@ FTRACE_ENTRY(hwlat, hwlat_entry, __field( unsigned int, seqnum ) ), - F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llunmi-ts:%llu\tnmi-count:%u\n", + F_printk("cnt:%u\tts:%010llu.%010lu\tinner:%llu\touter:%llu\tnmi-ts:%llu\tnmi-count:%u\n", __entry->seqnum, __entry->tv_sec, __entry->tv_nsec,
net/core/dev.c +1 -1
@@ -2942,7 +2942,7 @@ netdev_features_t passthru_features_check(struct sk_buff *skb, }EXPORT_SYMBOL (passthru_features_check); -static netdev_features_t dflt_features_check (const struct sk_buff *skb, +static netdev_features_t dflt_features_check (struct sk_buff *skb,struct net_device *dev,netdev_features_t features) {
net/core/neighbour.c +26 -14
@@ -55,7 +55,8 @@ static void neigh_timer_handler(struct timer_list *t);static void __neigh_notify (struct neighbour *n,int type,int flags,u32 pid);static void neigh_update_notify (struct neighbour *neigh,u32 nlmsg_pid); -static int pneigh_ifdown (struct neigh_table *tbl,struct net_device *dev); +static int pneigh_ifdown_and_unlock (struct neigh_table *tbl, +struct net_device *dev);#ifdef CONFIG_PROC_FS static const struct file_operations neigh_stat_seq_fops;
@@ -291,8 +292,7 @@ int neigh_ifdown(struct neigh_table *tbl, struct net_device *dev) {write_lock_bh (&tbl->lock);neigh_flush_dev (tbl, dev); -pneigh_ifdown (tbl, dev); -write_unlock_bh (&tbl->lock); +pneigh_ifdown_and_unlock (tbl, dev);del_timer_sync (&tbl->proxy_timer);pneigh_queue_purge (&tbl->proxy_queue);
@@ -681,9 +681,10 @@ int pneigh_delete(struct neigh_table *tbl, struct net *net, const void *pkey,return -ENOENT ; } -static int pneigh_ifdown (struct neigh_table *tbl,struct net_device *dev) +static int pneigh_ifdown_and_unlock (struct neigh_table *tbl, +struct net_device *dev) { -struct pneigh_entry *n, **np; +struct pneigh_entry *n, **np, *freelist =NULL ;u32 h;for (h =0 ; h <=PNEIGH_HASHMASK ; h++) {
@@ -691,16 +692,23 @@ static int pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev)while ((n = *np) !=NULL ) {if (!dev || n->dev == dev) { *np = n->next; -if (tbl->pdestructor) - tbl->pdestructor (n); -if (n->dev) -dev_put (n->dev); -kfree (n); + n->next = freelist; + freelist = n;continue ; } np = &n->next; } } +write_unlock_bh (&tbl->lock); +while ((n = freelist)) { + freelist = n->next; + n->next =NULL ; +if (tbl->pdestructor) + tbl->pdestructor (n); +if (n->dev) +dev_put (n->dev); +kfree (n); + }return -ENOENT ; }
@@ -2323,12 +2331,16 @@ static int neigh_dump_table(struct neigh_table *tbl, struct sk_buff *skb, err =nlmsg_parse (nlh,sizeof (struct ndmsg ), tb,NDA_MAX ,NULL ,NULL );if (!err) { -if (tb[NDA_IFINDEX ]) +if (tb[NDA_IFINDEX ]) { +if (nla_len (tb[NDA_IFINDEX ]) !=sizeof (u32)) +return -EINVAL ; filter_idx =nla_get_u32 (tb[NDA_IFINDEX ]); - -if (tb[NDA_MASTER ]) + } +if (tb[NDA_MASTER ]) { +if (nla_len (tb[NDA_MASTER ]) !=sizeof (u32)) +return -EINVAL ; filter_master_idx =nla_get_u32 (tb[NDA_MASTER ]); - + }if (filter_idx || filter_master_idx) flags |=NLM_F_DUMP_FILTERED ; }
net/dns_resolver/dns_key.c +5 -7
@@ -91,9 +91,9 @@ dns_resolver_preparse(struct key_preparsed_payload *prep) next_opt =memchr (opt,'#' , end - opt) ?: end; opt_len = next_opt - opt; -if (!opt_len) { -printk (KERN_WARNING -"Empty option to dns_resolver key\n" ); +if (opt_len <=0 || opt_len >128 ) { +pr_warn_ratelimited ("Invalid option length (%d) for dns_resolver key\n" , + opt_len);return -EINVAL ; }
@@ -127,10 +127,8 @@ dns_resolver_preparse(struct key_preparsed_payload *prep) } bad_option_value: -printk (KERN_WARNING -"Option '%*.*s' to dns_resolver key:" -" bad/missing value\n" , - opt_nlen, opt_nlen, opt); +pr_warn_ratelimited ("Option '%*.*s' to dns_resolver key: bad/missing value\n" , + opt_nlen, opt_nlen, opt);return -EINVAL ; }while (opt = next_opt +1 , opt < end); }
net/ife/ife.c +36 -2
@@ -69,6 +69,9 @@ void *ife_decode(struct sk_buff *skb, u16 *metalen)int total_pull;u16 ifehdrln; +if (!pskb_may_pull (skb, skb->dev->hard_header_len +IFE_METAHDRLEN )) +return NULL ; + ifehdr = (struct ifeheadr *) (skb->data + skb->dev->hard_header_len); ifehdrln =ntohs (ifehdr->metalen); total_pull = skb->dev->hard_header_len + ifehdrln;
@@ -92,12 +95,43 @@ struct meta_tlvhdr {__be16 len; }; +static bool __ife_tlv_meta_valid (const unsigned char *skbdata, +const unsigned char *ifehdr_end) +{ +const struct meta_tlvhdr *tlv; +u16 tlvlen; + +if (unlikely (skbdata +sizeof (*tlv) > ifehdr_end)) +return false; + + tlv = (const struct meta_tlvhdr *)skbdata; + tlvlen =ntohs (tlv->len); + +/* tlv length field is inc header, check on minimum */ +if (tlvlen <NLA_HDRLEN ) +return false; + +/* overflow by NLA_ALIGN check */ +if (NLA_ALIGN (tlvlen) < tlvlen) +return false; + +if (unlikely (skbdata +NLA_ALIGN (tlvlen) > ifehdr_end)) +return false; + +return true; +} +/* Caller takes care of presenting data in network order */ -void *ife_tlv_meta_decode (void *skbdata,u16 *attrtype,u16 *dlen,u16 *totlen) +void *ife_tlv_meta_decode (void *skbdata,const void *ifehdr_end,u16 *attrtype, +u16 *dlen,u16 *totlen) { -struct meta_tlvhdr *tlv = (struct meta_tlvhdr *) skbdata; +struct meta_tlvhdr *tlv; + +if (!__ife_tlv_meta_valid (skbdata, ifehdr_end)) +return NULL ; + tlv = (struct meta_tlvhdr *)skbdata; *dlen =ntohs (tlv->len) -NLA_HDRLEN ; *attrtype =ntohs (tlv->type);
net/ipv4/tcp.c +5 -3
@@ -2385,6 +2385,7 @@ void tcp_write_queue_purge(struct sock *sk)INIT_LIST_HEAD (&tcp_sk (sk)->tsorted_sent_queue);sk_mem_reclaim (sk);tcp_clear_all_retrans_hints (tcp_sk (sk)); +tcp_sk (sk)->packets_out =0 ; }int tcp_disconnect (struct sock *sk,int flags)
@@ -2434,7 +2435,6 @@ int tcp_disconnect(struct sock *sk, int flags) icsk->icsk_backoff =0 ; tp->snd_cwnd =2 ; icsk->icsk_probes_out =0 ; - tp->packets_out =0 ; tp->snd_ssthresh =TCP_INFINITE_SSTHRESH ; tp->snd_cwnd_cnt =0 ; tp->window_clamp =0 ;
@@ -2830,8 +2830,10 @@ static int do_tcp_setsockopt(struct sock *sk, int level,#ifdef CONFIG_TCP_MD5SIG case TCP_MD5SIG :case TCP_MD5SIG_EXT : -/* Read the IP->Key mappings from userspace */ - err = tp->af_specific->md5_parse (sk, optname, optval, optlen); +if ((1 << sk->sk_state) & (TCPF_CLOSE |TCPF_LISTEN )) + err = tp->af_specific->md5_parse (sk, optname, optval, optlen); +else + err = -EINVAL ;break ;#endif case TCP_USER_TIMEOUT :
net/ipv4/tcp_input.c +2 -5
@@ -3871,11 +3871,8 @@ const u8 *tcp_parse_md5sig_option(const struct tcphdr *th)int length = (th->doff <<2 ) -sizeof (*th);const u8 *ptr = (const u8 *)(th +1 ); -/* If the TCP option is too short, we can short cut */ -if (length <TCPOLEN_MD5SIG ) -return NULL ; - -while (length >0 ) { +/* If not enough data remaining, we can short cut */ +while (length >=TCPOLEN_MD5SIG ) {int opcode = *ptr++;int opsize;
net/ipv6/route.c +2 -0
@@ -3862,6 +3862,7 @@ void rt6_mtu_change(struct net_device *dev, unsigned int mtu)static const struct nla_policy rtm_ipv6_policy[RTA_MAX +1 ] = { [RTA_GATEWAY ] = { .len =sizeof (struct in6_addr ) }, + [RTA_PREFSRC ] = { .len =sizeof (struct in6_addr ) }, [RTA_OIF ] = { .type =NLA_U32 }, [RTA_IIF ] = { .type =NLA_U32 }, [RTA_PRIORITY ] = { .type =NLA_U32 },
@@ -3873,6 +3874,7 @@ static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = { [RTA_EXPIRES] = { .type = NLA_U32 }, [RTA_UID] = { .type = NLA_U32 }, [RTA_MARK] = { .type = NLA_U32 }, + [RTA_TABLE] = { .type = NLA_U32 }, }; static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
net/ipv6/seg6_iptunnel.c +1 -1
@@ -136,7 +136,7 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto) isrh->nexthdr = proto; hdr->daddr = isrh->segments[isrh->first_segment]; -set_tun_src (net,ip6_dst_idev (dst)->dev, &hdr->daddr, &hdr->saddr); +set_tun_src (net, dst->dev, &hdr->daddr, &hdr->saddr);#ifdef CONFIG_IPV6_SEG6_HMAC if (sr_has_hmac (isrh)) {
net/l2tp/l2tp_core.c +20 -20
@@ -183,6 +183,26 @@ struct l2tp_tunnel *l2tp_tunnel_get(const struct net *net, u32 tunnel_id) }EXPORT_SYMBOL_GPL (l2tp_tunnel_get); +struct l2tp_tunnel *l2tp_tunnel_get_nth (const struct net *net,int nth) +{ +const struct l2tp_net *pn =l2tp_pernet (net); +struct l2tp_tunnel *tunnel; +int count =0 ; + +rcu_read_lock_bh (); +list_for_each_entry_rcu (tunnel, &pn->l2tp_tunnel_list, list) { +if (++count > nth) { +l2tp_tunnel_inc_refcount (tunnel); +rcu_read_unlock_bh (); +return tunnel; + } + } +rcu_read_unlock_bh (); + +return NULL ; +} +EXPORT_SYMBOL_GPL (l2tp_tunnel_get_nth); +/* Lookup a session. A new reference is held on the returned session. */ struct l2tp_session *l2tp_session_get(const struct net *net, struct l2tp_tunnel *tunnel,
@@ -335,26 +355,6 @@ int l2tp_session_register(struct l2tp_session *session, }EXPORT_SYMBOL_GPL (l2tp_session_register); -struct l2tp_tunnel *l2tp_tunnel_find_nth (const struct net *net,int nth) -{ -struct l2tp_net *pn =l2tp_pernet (net); -struct l2tp_tunnel *tunnel; -int count =0 ; - -rcu_read_lock_bh (); -list_for_each_entry_rcu (tunnel, &pn->l2tp_tunnel_list, list) { -if (++count > nth) { -rcu_read_unlock_bh (); -return tunnel; - } - } - -rcu_read_unlock_bh (); - -return NULL ; -} -EXPORT_SYMBOL_GPL (l2tp_tunnel_find_nth); -/***************************************************************************** * Receive data handling *****************************************************************************/
net/l2tp/l2tp_core.h +2 -1
@@ -212,6 +212,8 @@ static inline void *l2tp_session_priv(struct l2tp_session *session) }struct l2tp_tunnel *l2tp_tunnel_get (const struct net *net,u32 tunnel_id); +struct l2tp_tunnel *l2tp_tunnel_get_nth (const struct net *net,int nth); +void l2tp_tunnel_free (struct l2tp_tunnel *tunnel); struct l2tp_session *l2tp_session_get(const struct net *net,
@@ -220,7 +222,6 @@ struct l2tp_session *l2tp_session_get(const struct net *net,struct l2tp_session *l2tp_session_get_nth (struct l2tp_tunnel *tunnel,int nth);struct l2tp_session *l2tp_session_get_by_ifname (const struct net *net,const char *ifname); -struct l2tp_tunnel *l2tp_tunnel_find_nth (const struct net *net,int nth); int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32 peer_tunnel_id, struct l2tp_tunnel_cfg *cfg,
net/l2tp/l2tp_debugfs.c +16 -2
@@ -47,7 +47,11 @@ struct l2tp_dfs_seq_data {static void l2tp_dfs_next_tunnel (struct l2tp_dfs_seq_data *pd) { - pd->tunnel =l2tp_tunnel_find_nth (pd->net, pd->tunnel_idx); +/* Drop reference taken during previous invocation */ +if (pd->tunnel) +l2tp_tunnel_dec_refcount (pd->tunnel); + + pd->tunnel =l2tp_tunnel_get_nth (pd->net, pd->tunnel_idx); pd->tunnel_idx++; }
@@ -96,7 +100,17 @@ static void *l2tp_dfs_seq_next(struct seq_file *m, void *v, loff_t *pos)static void l2tp_dfs_seq_stop (struct seq_file *p,void *v) { -/* nothing to do */ +struct l2tp_dfs_seq_data *pd = v; + +if (!pd || pd ==SEQ_START_TOKEN ) +return ; + +/* Drop reference taken by last invocation of l2tp_dfs_next_tunnel() */ +if (pd->tunnel) { +l2tp_tunnel_dec_refcount (pd->tunnel); + pd->tunnel =NULL ; + pd->session =NULL ; + } }static void l2tp_dfs_seq_tunnel_show (struct seq_file *m,void *v)
net/l2tp/l2tp_netlink.c +8 -3
@@ -487,14 +487,17 @@ static int l2tp_nl_cmd_tunnel_dump(struct sk_buff *skb, struct netlink_callbackstruct net *net =sock_net (skb->sk);for (;;) { - tunnel =l2tp_tunnel_find_nth (net, ti); + tunnel =l2tp_tunnel_get_nth (net, ti);if (tunnel ==NULL ) goto out;if (l2tp_nl_tunnel_send (skb,NETLINK_CB (cb->skb).portid, cb->nlh->nlmsg_seq,NLM_F_MULTI , - tunnel,L2TP_CMD_TUNNEL_GET ) <0 ) + tunnel,L2TP_CMD_TUNNEL_GET ) <0 ) { +l2tp_tunnel_dec_refcount (tunnel); goto out; + } +l2tp_tunnel_dec_refcount (tunnel); ti++; }
@@ -848,7 +851,7 @@ static int l2tp_nl_cmd_session_dump(struct sk_buff *skb, struct netlink_callbackfor (;;) {if (tunnel ==NULL ) { - tunnel =l2tp_tunnel_find_nth (net, ti); + tunnel =l2tp_tunnel_get_nth (net, ti);if (tunnel ==NULL ) goto out; }
@@ -856,6 +859,7 @@ static int l2tp_nl_cmd_session_dump(struct sk_buff *skb, struct netlink_callback session =l2tp_session_get_nth (tunnel, si);if (session ==NULL ) { ti++; +l2tp_tunnel_dec_refcount (tunnel); tunnel =NULL ; si =0 ;continue ;
@@ -865,6 +869,7 @@ static int l2tp_nl_cmd_session_dump(struct sk_buff *skb, struct netlink_callback cb->nlh->nlmsg_seq, NLM_F_MULTI, session, L2TP_CMD_SESSION_GET) < 0) {l2tp_session_dec_refcount (session); +l2tp_tunnel_dec_refcount (tunnel);break ; }l2tp_session_dec_refcount (session);
net/l2tp/l2tp_ppp.c +27 -7
@@ -619,6 +619,13 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,lock_sock (sk); error = -EINVAL ; + +if (sockaddr_len !=sizeof (struct sockaddr_pppol2tp ) && + sockaddr_len !=sizeof (struct sockaddr_pppol2tpv3 ) && + sockaddr_len !=sizeof (struct sockaddr_pppol2tpin6 ) && + sockaddr_len !=sizeof (struct sockaddr_pppol2tpv3in6 )) + goto end; +if (sp->sa_protocol !=PX_PROTO_OL2TP ) goto end;
@@ -1552,16 +1559,19 @@ struct pppol2tp_seq_data {static void pppol2tp_next_tunnel (struct net *net,struct pppol2tp_seq_data *pd) { +/* Drop reference taken during previous invocation */ +if (pd->tunnel) +l2tp_tunnel_dec_refcount (pd->tunnel); +for (;;) { - pd->tunnel =l2tp_tunnel_find_nth (net, pd->tunnel_idx); + pd->tunnel =l2tp_tunnel_get_nth (net, pd->tunnel_idx); pd->tunnel_idx++; -if (pd->tunnel ==NULL ) -break ; +/* Only accept L2TPv2 tunnels */ +if (!pd->tunnel || pd->tunnel->version ==2 ) +return ; -/* Ignore L2TPv3 tunnels */ -if (pd->tunnel->version <3 ) -break ; +l2tp_tunnel_dec_refcount (pd->tunnel); } }
@@ -1610,7 +1620,17 @@ static void *pppol2tp_seq_next(struct seq_file *m, void *v, loff_t *pos)static void pppol2tp_seq_stop (struct seq_file *p,void *v) { -/* nothing to do */ +struct pppol2tp_seq_data *pd = v; + +if (!pd || pd ==SEQ_START_TOKEN ) +return ; + +/* Drop reference taken by last invocation of pppol2tp_next_tunnel() */ +if (pd->tunnel) { +l2tp_tunnel_dec_refcount (pd->tunnel); + pd->tunnel =NULL ; + pd->session =NULL ; + } }static void pppol2tp_seq_tunnel_show (struct seq_file *m,void *v)
net/llc/af_llc.c +12 -2
@@ -199,9 +199,19 @@ static int llc_ui_release(struct socket *sock) llc->laddr.lsap, llc->daddr.lsap);if (!llc_send_disc (sk))llc_ui_wait_for_disc (sk, sk->sk_rcvtimeo); -if (!sock_flag (sk,SOCK_ZAPPED )) +if (!sock_flag (sk,SOCK_ZAPPED )) { +struct llc_sap *sap = llc->sap; + +/* Hold this for release_sock(), so that llc_backlog_rcv() +* could still use it. +*/ +llc_sap_hold (sap);llc_sap_remove_socket (llc->sap, sk); -release_sock (sk); +release_sock (sk); +llc_sap_put (sap); + }else { +release_sock (sk); + }if (llc->dev)dev_put (llc->dev);sock_put (sk);
net/llc/llc_c_ac.c +1 -8
@@ -1099,14 +1099,7 @@ int llc_conn_ac_inc_tx_win_size(struct sock *sk, struct sk_buff *skb)int llc_conn_ac_stop_all_timers (struct sock *sk,struct sk_buff *skb) { -struct llc_sock *llc =llc_sk (sk); - -del_timer (&llc->pf_cycle_timer.timer); -del_timer (&llc->ack_timer.timer); -del_timer (&llc->rej_sent_timer.timer); -del_timer (&llc->busy_state_timer.timer); - llc->ack_must_be_send =0 ; - llc->ack_pf =0 ; +llc_sk_stop_all_timers (sk, false);return 0 ; }
net/llc/llc_conn.c +21 -1
@@ -961,6 +961,26 @@ struct sock *llc_sk_alloc(struct net *net, int family, gfp_t priority, struct prreturn sk; } +void llc_sk_stop_all_timers (struct sock *sk,bool sync) +{ +struct llc_sock *llc =llc_sk (sk); + +if (sync) { +del_timer_sync (&llc->pf_cycle_timer.timer); +del_timer_sync (&llc->ack_timer.timer); +del_timer_sync (&llc->rej_sent_timer.timer); +del_timer_sync (&llc->busy_state_timer.timer); + }else { +del_timer (&llc->pf_cycle_timer.timer); +del_timer (&llc->ack_timer.timer); +del_timer (&llc->rej_sent_timer.timer); +del_timer (&llc->busy_state_timer.timer); + } + + llc->ack_must_be_send =0 ; + llc->ack_pf =0 ; +} +/** * llc_sk_free - Frees a LLC socket * @sk - socket to free
@@ -973,7 +993,7 @@ void llc_sk_free(struct sock *sk) llc->state =LLC_CONN_OUT_OF_SVC ;/* Stop all (possibly) running timers */ -llc_conn_ac_stop_all_timers (sk,NULL ); +llc_sk_stop_all_timers (sk, true);#ifdef DEBUG_LLC_CONN_ALLOC printk(KERN_INFO "%s: unackq=%d, txq=%d\n", __func__, skb_queue_len(&llc->pdu_unack_q),
net/packet/af_packet.c +58 -25
187 lines not on this page · raw message
net/packet/internal.h +5 -5
@@ -112,10 +112,12 @@ struct packet_sock {int copy_thresh;spinlock_t bind_lock;struct mutex pg_vec_lock; - unsigned int running:1, /* prot_hook is attached*/ - auxdata:1, +unsigned int running;/* bind_lock must be held */ + unsigned int auxdata:1, /* writer must hold sock lock */ origdev:1, - has_vnet_hdr:1; + has_vnet_hdr:1, + tp_loss:1, + tp_tx_has_off:1;int pressure;
Lines of this file are not shown. View the raw message.
net/sctp/ipv6.c +30 -30
60 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.