Linux 4.19.8
Greg KH
maintainerI'm announcing the release of the 4.19.8 kernel.
All users of the 4.19 kernel series must upgrade.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.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
------------
Makefile | 2 arch/arc/Kconfig | 2 arch/arc/Makefile | 2 arch/arc/configs/axs101_defconfig | 2 arch/arc/configs/axs103_defconfig | 1 arch/arc/configs/axs103_smp_defconfig | 1 arch/arc/configs/hsdk_defconfig | 1 arch/arc/configs/nps_defconfig | 2 arch/arc/configs/nsim_700_defconfig | 1 arch/arc/configs/nsimosci_defconfig | 2 arch/arc/configs/nsimosci_hs_defconfig | 1 arch/arc/configs/nsimosci_hs_smp_defconfig | 1 arch/arc/configs/tb10x_defconfig | 1 arch/arc/configs/vdk_hs38_defconfig | 1 arch/arc/configs/vdk_hs38_smp_defconfig | 1 arch/arm64/include/asm/ftrace.h | 13 ++ arch/mips/include/asm/syscall.h | 2 arch/mips/ralink/mt7620.c | 2 arch/x86/kvm/svm.c | 19 ++-- block/blk-mq.c | 7 - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 drivers/gpu/drm/ast/ast_main.c | 3 drivers/gpu/drm/drm_auth.c | 2 drivers/gpu/drm/meson/meson_crtc.c | 27 +++++ drivers/gpu/drm/meson/meson_dw_hdmi.c | 1 drivers/gpu/drm/meson/meson_venc.c | 3 drivers/gpu/drm/meson/meson_viu.c | 12 +- drivers/infiniband/hw/mlx5/main.c | 29 ++---- drivers/infiniband/ulp/iser/iser_verbs.c | 7 - drivers/input/joystick/xpad.c | 16 +-- drivers/input/keyboard/cros_ec_keyb.c | 3 drivers/input/keyboard/matrix_keypad.c | 23 ++-- drivers/input/mouse/elan_i2c_core.c | 3 drivers/input/mouse/synaptics.c | 1 drivers/mtd/nand/bbt.c | 3 drivers/net/ethernet/intel/i40e/i40e_main.c | 2 drivers/scsi/lpfc/lpfc_init.c | 6 + drivers/scsi/lpfc/lpfc_sli.c | 1 drivers/tty/serial/kgdboc.c | 43 ++++----- fs/btrfs/tree-checker.c | 8 - include/linux/tracepoint.h | 6 - include/trace/events/sched.h | 12 ++ kernel/events/uprobes.c | 12 ++ kernel/trace/trace.h | 57 +++++++++++- kernel/trace/trace_functions_graph.c | 4 kernel/trace/trace_irqsoff.c | 2 kernel/trace/trace_sched_wakeup.c | 2 lib/test_hexdump.c | 2 mm/hugetlb.c | 2 mm/shmem.c | 31 +++++- mm/userfaultfd.c | 47 ++++++++- net/tipc/topsrv.c | 2 scripts/unifdef.c | 4 security/selinux/nlmsgtab.c | 13 ++ 54 files changed, 332 insertions(+), 123 deletions(-)
Adam Wong (1):
Input: elan_i2c - add support for ELAN0621 touchpad
Alexey Brodkin (1):
arc: [devboards] Add support of NFSv3 ACL
Andrea Arcangeli (4):
userfaultfd: use ENOENT instead of EFAULT if the atomic copy user fails
userfaultfd: shmem: allocate anonymous memory for MAP_PRIVATE shmem
userfaultfd: shmem: add i_size checks
userfaultfd: shmem: UFFDIO_COPY: set the page dirty if VM_WRITE is not set
Andrea Parri (1):
uprobes: Fix handle_swbp() vs. unregister() + register() race once more
Brian Norris (1):
Input: cros_ec_keyb - fix button/switch capability reports
Cameron Gutman (1):
Input: xpad - quirk all PDP Xbox One gamepads
Christian Hoff (1):
Input: matrix_keypad - check for errors from of_get_named_gpio()
Dmitry V. Levin (1):
mips: fix mips_get_syscall_arg o32 check
Frieder Schrempf (1):
mtd: nand: Fix memory allocation in nanddev_bbt_init()
Greg Kroah-Hartman (1):
Linux 4.19.8
Guoqing Jiang (1):
tipc: use destination length for copy string
Jens Axboe (2):
blk-mq: fix corruption with direct issue
blk-mq: punt failed direct issue to dispatch list
Kevin Hilman (1):
ARC: change defconfig defaults to ARCv2
Laura Abbott (2):
kgdboc: Fix restrict error
kgdboc: Fix warning with module build
Lihong Yang (1):
i40e: Fix deletion of MAC filters
Linus Torvalds (2):
test_hexdump: use memcpy instead of strncpy
unifdef: use memcpy instead of strncpy
Lyude Paul (4):
drm/amd/dm: Don't forget to attach MST encoders drm/meson: Enable fast_io in meson_dw_hdmi_regmap_config drm/meson: Fix OOB memory accesses in meson_viu_set_osd_lut()
Input: synaptics - add PNP ID for ThinkPad P50 to SMBus
Martin Wilck (1):
scsi: lpfc: fix block guard enablement on SLI3 adapters
Masami Hiramatsu (1):
arm64: ftrace: Fix to enable syscall events on arm64
Mathias Kresin (1):
MIPS: ralink: Fix mt7620 nd_sd pinmux
Michael Guralnik (1):
IB/mlx5: Avoid load failure due to unknown link width
Neil Armstrong (1):
drm/meson: Fixes for drm_crtc_vblank_on/off support
Noah Westervelt (1):
Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15ARR
Patrick Gaskin (1):
Input: elan_i2c - add ELAN0620 to the ACPI table
Paul Moore (1):
selinux: add support for RTM_NEWCHAIN, RTM_DELCHAIN, and RTM_GETCHAIN
Pavankumar Kondeti (1):
sched, trace: Fix prev_state output in sched_switch tracepoint
Qu Wenruo (1):
btrfs: tree-checker: Don't check max block group size as current max chunk size limit is unreliable
Sagi Grimberg (1):
iser: set sector for ambiguous mr status errors
Sam Bobroff (1):
drm/ast: Fix incorrect free on ioregs
Sergio Correia (1):
drm: set is_master to 0 upon drm_new_set_master() failure
Steven Rostedt (VMware) (1):
tracing/fgraph: Fix set_graph_function from showing interrupts
Wei Wang (1):
svm: Add mutex_lock to protect apic_access_page_done on AMD systems
Zenghui Yu (1):
tracepoint: Use __idx instead of idx in DO_TRACE macro to make it unique
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = NAME = "People's Front"
arch/arc/Kconfig +1 -1
@@ -111,7 +111,7 @@ endmenu choice prompt "ARC Instruction Set" - default ISA_ARCOMPACT + default ISA_ARCV2 config ISA_ARCOMPACT bool "ARCompact ISA"
arch/arc/Makefile +1 -1
@@ -6,7 +6,7 @@ # published by the Free Software Foundation. # -KBUILD_DEFCONFIG := nsim_700_defconfig +KBUILD_DEFCONFIG := nsim_hs_defconfig cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__ cflags-$(CONFIG_ISA_ARCOMPACT) += -mA7
arch/arc/configs/axs101_defconfig +2 -0
@@ -14,6 +14,7 @@ CONFIG_PERF_EVENTS=y # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_SLUB_DEBUG is not set # CONFIG_COMPAT_BRK is not set +CONFIG_ISA_ARCOMPACT=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y
@@ -95,6 +96,7 @@ CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y CONFIG_TMPFS=y CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_WARN_DEPRECATED is not set
arch/arc/configs/axs103_defconfig +1 -0
@@ -94,6 +94,7 @@ CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y CONFIG_TMPFS=y CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_WARN_DEPRECATED is not set
arch/arc/configs/axs103_smp_defconfig +1 -0
@@ -97,6 +97,7 @@ CONFIG_VFAT_FS=y CONFIG_NTFS_FS=y CONFIG_TMPFS=y CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_WARN_DEPRECATED is not set
arch/arc/configs/hsdk_defconfig +1 -0
@@ -65,6 +65,7 @@ CONFIG_EXT3_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_WARN_DEPRECATED is not set
arch/arc/configs/nps_defconfig +2 -0
@@ -15,6 +15,7 @@ CONFIG_SYSCTL_SYSCALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set +CONFIG_ISA_ARCOMPACT=y CONFIG_KPROBES=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y
@@ -73,6 +74,7 @@ CONFIG_PROC_KCORE=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y CONFIG_ROOT_NFS=y CONFIG_DEBUG_INFO=y # CONFIG_ENABLE_WARN_DEPRECATED is not set
arch/arc/configs/nsim_700_defconfig +1 -0
@@ -15,6 +15,7 @@ CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_SLUB_DEBUG is not set # CONFIG_COMPAT_BRK is not set +CONFIG_ISA_ARCOMPACT=y CONFIG_KPROBES=y CONFIG_MODULES=y # CONFIG_LBDAF is not set
arch/arc/configs/nsimosci_defconfig +2 -0
@@ -15,6 +15,7 @@ CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_SLUB_DEBUG is not set # CONFIG_COMPAT_BRK is not set +CONFIG_ISA_ARCOMPACT=y CONFIG_KPROBES=y CONFIG_MODULES=y # CONFIG_LBDAF is not set
@@ -66,5 +67,6 @@ CONFIG_EXT2_FS_XATTR=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set
arch/arc/configs/nsimosci_hs_defconfig +1 -0
@@ -65,5 +65,6 @@ CONFIG_EXT2_FS_XATTR=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set
arch/arc/configs/nsimosci_hs_smp_defconfig +1 -0
@@ -76,6 +76,7 @@ CONFIG_EXT2_FS_XATTR=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FTRACE=y
arch/arc/configs/tb10x_defconfig +1 -0
@@ -19,6 +19,7 @@ CONFIG_KALLSYMS_ALL=y # CONFIG_AIO is not set CONFIG_EMBEDDED=y # CONFIG_COMPAT_BRK is not set +CONFIG_ISA_ARCOMPACT=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y
arch/arc/configs/vdk_hs38_defconfig +1 -0
@@ -85,6 +85,7 @@ CONFIG_NTFS_FS=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_WARN_DEPRECATED is not set
arch/arc/configs/vdk_hs38_smp_defconfig +1 -0
@@ -90,6 +90,7 @@ CONFIG_NTFS_FS=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_WARN_DEPRECATED is not set
arch/arm64/include/asm/ftrace.h +13 -0
@@ -56,6 +56,19 @@ static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs) {return is_compat_task (); } + +#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME + +static inline bool arch_syscall_match_sym_name (const char *sym, +const char *name) +{ +/* +* Since all syscall functions have __arm64_ prefix, we must skip it. +* However, as we described above, we decided to ignore compat +* syscalls, so we don't care about __arm64_compat_ prefix here. +*/ +return !strcmp (sym +8 , name); +}#endif /* ifndef __ASSEMBLY__ */ #endif /* __ASM_FTRACE_H */
arch/mips/include/asm/syscall.h +1 -1
@@ -73,7 +73,7 @@ static inline unsigned long mips_get_syscall_arg(unsigned long *arg,#ifdef CONFIG_64BIT case 4 :case 5 :case 6 :case 7 :#ifdef CONFIG_MIPS32_O32 -if (test_thread_flag (TIF_32BIT_REGS )) +if (test_tsk_thread_flag (task,TIF_32BIT_REGS ))return get_user (*arg, (int *)usp + n); else#endif
arch/mips/ralink/mt7620.c +1 -1
@@ -84,7 +84,7 @@ static struct rt2880_pmx_func pcie_rst_grp[] = { };static struct rt2880_pmx_func nd_sd_grp[] = {FUNC ("nand" ,MT7620_GPIO_MODE_NAND ,45 ,15 ), -FUNC ("sd" ,MT7620_GPIO_MODE_SD ,45 ,15 ) +FUNC ("sd" ,MT7620_GPIO_MODE_SD ,47 ,13 ) };static struct rt2880_pmx_group mt7620a_pinmux_data[] = {
arch/x86/kvm/svm.c +11 -8
@@ -1663,20 +1663,23 @@ static u64 *avic_get_physical_id_entry(struct kvm_vcpu *vcpu,static int avic_init_access_page (struct kvm_vcpu *vcpu) {struct kvm *kvm = vcpu->kvm; -int ret; +int ret =0 ; +mutex_lock (&kvm->slots_lock);if (kvm->arch.apic_access_page_done) -return 0 ; + goto out; - ret =x86_set_memory_region (kvm, -APIC_ACCESS_PAGE_PRIVATE_MEMSLOT , -APIC_DEFAULT_PHYS_BASE , -PAGE_SIZE ); + ret =__x86_set_memory_region (kvm, +APIC_ACCESS_PAGE_PRIVATE_MEMSLOT , +APIC_DEFAULT_PHYS_BASE , +PAGE_SIZE );if (ret) -return ret; + goto out; kvm->arch.apic_access_page_done = true; -return 0 ; +out: +mutex_unlock (&kvm->slots_lock); +return ret; }static int avic_init_backing_page (struct kvm_vcpu *vcpu)
block/blk-mq.c +4 -3
@@ -1747,7 +1747,7 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,if (bypass_insert)return BLK_STS_RESOURCE ; -blk_mq_sched_insert_request (rq, false, run_queue, false); +blk_mq_request_bypass_insert (rq, run_queue);return BLK_STS_OK ; }
@@ -1763,7 +1763,7 @@ static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, ret =__blk_mq_try_issue_directly (hctx, rq, cookie, false);if (ret ==BLK_STS_RESOURCE || ret ==BLK_STS_DEV_RESOURCE ) -blk_mq_sched_insert_request (rq, false, true, false); +blk_mq_request_bypass_insert (rq, true);else if (ret !=BLK_STS_OK )blk_mq_end_request (rq, ret);
@@ -1798,7 +1798,8 @@ void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,if (ret !=BLK_STS_OK ) {if (ret ==BLK_STS_RESOURCE || ret ==BLK_STS_DEV_RESOURCE ) { -list_add (&rq->queuelist, list); +blk_mq_request_bypass_insert (rq, +list_empty (list));break ; }blk_mq_end_request (rq, ret);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +2 -0
@@ -374,6 +374,8 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, master->connector_id); aconnector->mst_encoder =dm_dp_create_fake_mst_encoder (master); +drm_connector_attach_encoder (&aconnector->base, + &aconnector->mst_encoder->base);/* * TODO: understand why this one is needed
drivers/gpu/drm/ast/ast_main.c +2 -1
@@ -583,7 +583,8 @@ void ast_driver_unload(struct drm_device *dev)drm_mode_config_cleanup (dev);ast_mm_fini (ast); -pci_iounmap (dev->pdev, ast->ioregs); +if (ast->ioregs != ast->regs +AST_IO_MM_OFFSET ) +pci_iounmap (dev->pdev, ast->ioregs);pci_iounmap (dev->pdev, ast->regs);kfree (ast); }
drivers/gpu/drm/drm_auth.c +2 -0
@@ -142,6 +142,7 @@ static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv)lockdep_assert_held_once (&dev->master_mutex); +WARN_ON (fpriv->is_master); old_master = fpriv->master; fpriv->master =drm_master_create (dev);if (!fpriv->master) {
@@ -170,6 +171,7 @@ static int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv)/* drop references and restore old master on failure */ drm_master_put (&fpriv->master); fpriv->master = old_master; + fpriv->is_master =0 ;return ret; }
drivers/gpu/drm/meson/meson_crtc.c +25 -2
@@ -45,6 +45,7 @@ struct meson_crtc {struct drm_crtc base;struct drm_pending_vblank_event *event;struct meson_drm *priv; +bool enabled; };#define to_meson_crtc (x) container_of(x, struct meson_crtc, base)
@@ -80,8 +81,7 @@ static const struct drm_crtc_funcs meson_crtc_funcs = { }; -static void meson_crtc_atomic_enable (struct drm_crtc *crtc, -struct drm_crtc_state *old_state) +static void meson_crtc_enable (struct drm_crtc *crtc) {struct meson_crtc *meson_crtc =to_meson_crtc (crtc);struct drm_crtc_state *crtc_state = crtc->state;
@@ -101,6 +101,22 @@ static void meson_crtc_atomic_enable(struct drm_crtc *crtc,writel_bits_relaxed (VPP_POSTBLEND_ENABLE ,VPP_POSTBLEND_ENABLE , priv->io_base +_REG (VPP_MISC )); +drm_crtc_vblank_on (crtc); + + meson_crtc->enabled = true; +} + +static void meson_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{ +struct meson_crtc *meson_crtc =to_meson_crtc (crtc); +struct meson_drm *priv = meson_crtc->priv; + +DRM_DEBUG_DRIVER ("\n" ); + +if (!meson_crtc->enabled) +meson_crtc_enable (crtc); + priv->viu.osd1_enabled = true; }
@@ -110,6 +126,8 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc,struct meson_crtc *meson_crtc =to_meson_crtc (crtc);struct meson_drm *priv = meson_crtc->priv; +drm_crtc_vblank_off (crtc); + priv->viu.osd1_enabled = false; priv->viu.osd1_commit = false;
@@ -124,6 +142,8 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc, crtc->state->event =NULL ; } + + meson_crtc->enabled = false; } static void meson_crtc_atomic_begin(struct drm_crtc *crtc,
@@ -132,6 +152,9 @@ static void meson_crtc_atomic_begin(struct drm_crtc *crtc,struct meson_crtc *meson_crtc =to_meson_crtc (crtc);unsigned long flags; +if (crtc->state->enable && !meson_crtc->enabled) +meson_crtc_enable (crtc); +if (crtc->state->event) {WARN_ON (drm_crtc_vblank_get (crtc) !=0 );
drivers/gpu/drm/meson/meson_dw_hdmi.c +1 -0
@@ -706,6 +706,7 @@ static const struct regmap_config meson_dw_hdmi_regmap_config = { .reg_read = meson_dw_hdmi_reg_read, .reg_write = meson_dw_hdmi_reg_write, .max_register = 0x10000, + .fast_io = true, };static bool meson_hdmi_connector_is_available (struct device *dev)
drivers/gpu/drm/meson/meson_venc.c +3 -0
@@ -71,6 +71,7 @@*/ /* HHI Registers */ +#define HHI_GCLK_MPEG2 0x148/* 0x52 offset in data sheet */ #define HHI_VDAC_CNTL0 0x2F4/* 0xbd offset in data sheet */ #define HHI_VDAC_CNTL1 0x2F8/* 0xbe offset in data sheet */ #define HHI_HDMI_PHY_CNTL0 0x3a0/* 0xe8 offset in data sheet */
@@ -1529,10 +1530,12 @@ unsigned int meson_venci_get_field(struct meson_drm *priv)void meson_venc_enable_vsync (struct meson_drm *priv) {writel_relaxed (2 , priv->io_base +_REG (VENC_INTCTRL )); +regmap_update_bits (priv->hhi,HHI_GCLK_MPEG2 ,BIT (25 ),BIT (25 )); }void meson_venc_disable_vsync (struct meson_drm *priv) { +regmap_update_bits (priv->hhi,HHI_GCLK_MPEG2 ,BIT (25 ),0 );writel_relaxed (0 , priv->io_base +_REG (VENC_INTCTRL )); }
drivers/gpu/drm/meson/meson_viu.c +6 -6
@@ -184,18 +184,18 @@ void meson_viu_set_osd_lut(struct meson_drm *priv, enum viu_lut_sel_e lut_sel,if (lut_sel ==VIU_LUT_OSD_OETF ) {writel (0 , priv->io_base +_REG (addr_port)); -for (i =0 ; i <20 ; i++) +for (i =0 ; i < (OSD_OETF_LUT_SIZE /2 ); i++)writel (r_map[i *2 ] | (r_map[i *2 +1 ] <<16 ), priv->io_base +_REG (data_port));writel (r_map[OSD_OETF_LUT_SIZE -1 ] | (g_map[0 ] <<16 ), priv->io_base +_REG (data_port)); -for (i =0 ; i <20 ; i++) +for (i =0 ; i < (OSD_OETF_LUT_SIZE /2 ); i++)writel (g_map[i *2 +1 ] | (g_map[i *2 +2 ] <<16 ), priv->io_base +_REG (data_port)); -for (i =0 ; i <20 ; i++) +for (i =0 ; i < (OSD_OETF_LUT_SIZE /2 ); i++)writel (b_map[i *2 ] | (b_map[i *2 +1 ] <<16 ), priv->io_base +_REG (data_port));
@@ -211,18 +211,18 @@ void meson_viu_set_osd_lut(struct meson_drm *priv, enum viu_lut_sel_e lut_sel, }else if (lut_sel ==VIU_LUT_OSD_EOTF ) {writel (0 , priv->io_base +_REG (addr_port)); -for (i =0 ; i <20 ; i++) +for (i =0 ; i < (OSD_EOTF_LUT_SIZE /2 ); i++)writel (r_map[i *2 ] | (r_map[i *2 +1 ] <<16 ), priv->io_base +_REG (data_port));writel (r_map[OSD_EOTF_LUT_SIZE -1 ] | (g_map[0 ] <<16 ), priv->io_base +_REG (data_port)); -for (i =0 ; i <20 ; i++) +for (i =0 ; i < (OSD_EOTF_LUT_SIZE /2 ); i++)writel (g_map[i *2 +1 ] | (g_map[i *2 +2 ] <<16 ), priv->io_base +_REG (data_port)); -for (i =0 ; i <20 ; i++) +for (i =0 ; i < (OSD_EOTF_LUT_SIZE /2 ); i++)writel (b_map[i *2 ] | (b_map[i *2 +1 ] <<16 ), priv->io_base +_REG (data_port));
drivers/infiniband/hw/mlx5/main.c +11 -18
@@ -1094,31 +1094,26 @@ enum mlx5_ib_width { MLX5_IB_WIDTH_12X = 1 << 4 }; -static int translate_active_width (struct ib_device *ibdev,u8 active_width, +static void translate_active_width (struct ib_device *ibdev,u8 active_width,u8 *ib_width) {struct mlx5_ib_dev *dev =to_mdev (ibdev); -int err =0 ; -if (active_width &MLX5_IB_WIDTH_1X ) { +if (active_width &MLX5_IB_WIDTH_1X ) *ib_width =IB_WIDTH_1X ; - }else if (active_width &MLX5_IB_WIDTH_2X ) { -mlx5_ib_dbg (dev,"active_width %d is not supported by IB spec\n" , - (int )active_width); - err = -EINVAL ; - }else if (active_width &MLX5_IB_WIDTH_4X ) { +else if (active_width &MLX5_IB_WIDTH_4X ) *ib_width =IB_WIDTH_4X ; - }else if (active_width &MLX5_IB_WIDTH_8X ) { +else if (active_width &MLX5_IB_WIDTH_8X ) *ib_width =IB_WIDTH_8X ; - }else if (active_width &MLX5_IB_WIDTH_12X ) { +else if (active_width &MLX5_IB_WIDTH_12X ) *ib_width =IB_WIDTH_12X ; - }else { -mlx5_ib_dbg (dev,"Invalid active_width %d\n" , +else { +mlx5_ib_dbg (dev,"Invalid active_width %d, setting width to default value: 4x\n" , (int )active_width); - err = -EINVAL ; + *ib_width =IB_WIDTH_4X ; } -return err; +return ; }static int mlx5_mtu_to_ib_mtu (int mtu)
@@ -1225,10 +1220,8 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port,if (err) goto out; - err =translate_active_width (ibdev, ib_link_width_oper, - &props->active_width); -if (err) - goto out; +translate_active_width (ibdev, ib_link_width_oper, &props->active_width); + err =mlx5_query_port_ib_proto_oper (mdev, &props->active_speed, port);if (err) goto out;
drivers/infiniband/ulp/iser/iser_verbs.c +3 -4
@@ -1123,7 +1123,9 @@ u8 iser_check_task_pi_status(struct iscsi_iser_task *iser_task, IB_MR_CHECK_SIG_STATUS, &mr_status);if (ret) {pr_err ("ib_check_mr_status failed, ret %d\n" , ret); - goto err; +/* Not a lot we can do, return ambiguous guard error */ + *sector =0 ; +return 0x1 ; }if (mr_status.fail_status &IB_MR_CHECK_SIG_STATUS ) {
@@ -1151,9 +1153,6 @@ u8 iser_check_task_pi_status(struct iscsi_iser_task *iser_task, }return 0 ; -err: -/* Not alot we can do here, return ambiguous guard error */ -return 0x1 ; }void iser_err_comp (struct ib_wc *wc,const char *type)
drivers/input/joystick/xpad.c +6 -10
@@ -480,18 +480,18 @@ static const u8 xboxone_hori_init[] = { };/* -* This packet is required for some of the PDP pads to start +* This packet is required for most (all?) of the PDP pads to start * sending input reports. These pads include: (0x0e6f:0x02ab), -* (0x0e6f:0x02a4). +* (0x0e6f:0x02a4), (0x0e6f:0x02a6). */ static const u8 xboxone_pdp_init1[] = {0x0a ,0x20 ,0x00 ,0x03 ,0x00 ,0x01 ,0x14 };/* -* This packet is required for some of the PDP pads to start +* This packet is required for most (all?) of the PDP pads to start * sending input reports. These pads include: (0x0e6f:0x02ab), -* (0x0e6f:0x02a4). +* (0x0e6f:0x02a4), (0x0e6f:0x02a6). */ static const u8 xboxone_pdp_init2[] = {0x06 ,0x20 ,0x00 ,0x02 ,0x01 ,0x00
@@ -527,12 +527,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = {XBOXONE_INIT_PKT (0x0e6f ,0x0165 , xboxone_hori_init),XBOXONE_INIT_PKT (0x0f0d ,0x0067 , xboxone_hori_init),XBOXONE_INIT_PKT (0x0000 ,0x0000 , xboxone_fw2015_init), -XBOXONE_INIT_PKT (0x0e6f ,0x02ab , xboxone_pdp_init1), -XBOXONE_INIT_PKT (0x0e6f ,0x02ab , xboxone_pdp_init2), -XBOXONE_INIT_PKT (0x0e6f ,0x02a4 , xboxone_pdp_init1), -XBOXONE_INIT_PKT (0x0e6f ,0x02a4 , xboxone_pdp_init2), -XBOXONE_INIT_PKT (0x0e6f ,0x02a6 , xboxone_pdp_init1), -XBOXONE_INIT_PKT (0x0e6f ,0x02a6 , xboxone_pdp_init2), +XBOXONE_INIT_PKT (0x0e6f ,0x0000 , xboxone_pdp_init1), +XBOXONE_INIT_PKT (0x0e6f ,0x0000 , xboxone_pdp_init2),XBOXONE_INIT_PKT (0x24c6 ,0x541a , xboxone_rumblebegin_init),XBOXONE_INIT_PKT (0x24c6 ,0x542a , xboxone_rumblebegin_init), XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),
drivers/input/keyboard/cros_ec_keyb.c +2 -1
@@ -493,7 +493,8 @@ static int cros_ec_keyb_register_bs(struct cros_ec_keyb *ckdev)for (i =0 ; i <ARRAY_SIZE (cros_ec_keyb_bs); i++) {const struct cros_ec_bs_map *map = &cros_ec_keyb_bs[i]; -if (buttons &BIT (map->bit)) +if ((map->ev_type ==EV_KEY && (buttons &BIT (map->bit))) || + (map->ev_type ==EV_SW && (switches &BIT (map->bit))))input_set_capability (idev, map->ev_type, map->code); }
drivers/input/keyboard/matrix_keypad.c +14 -9
@@ -407,7 +407,7 @@ matrix_keypad_parse_dt(struct device *dev)struct matrix_keypad_platform_data *pdata;struct device_node *np = dev->of_node;unsigned int *gpios; -int i, nrow, ncol; +int ret, i, nrow, ncol;if (!np) {dev_err (dev,"device lacks DT data\n" );
@@ -452,12 +452,19 @@ matrix_keypad_parse_dt(struct device *dev)return ERR_PTR (-ENOMEM ); } -for (i =0 ; i < pdata->num_row_gpios; i++) - gpios[i] =of_get_named_gpio (np,"row-gpios" , i); +for (i =0 ; i < nrow; i++) { + ret =of_get_named_gpio (np,"row-gpios" , i); +if (ret <0 ) +return ERR_PTR (ret); + gpios[i] = ret; + } -for (i =0 ; i < pdata->num_col_gpios; i++) - gpios[pdata->num_row_gpios + i] = -of_get_named_gpio (np,"col-gpios" , i); +for (i =0 ; i < ncol; i++) { + ret =of_get_named_gpio (np,"col-gpios" , i); +if (ret <0 ) +return ERR_PTR (ret); + gpios[nrow + i] = ret; + } pdata->row_gpios = gpios; pdata->col_gpios = &gpios[pdata->num_row_gpios];
@@ -484,10 +491,8 @@ static int matrix_keypad_probe(struct platform_device *pdev) pdata =dev_get_platdata (&pdev->dev);if (!pdata) { pdata =matrix_keypad_parse_dt (&pdev->dev); -if (IS_ERR (pdata)) { -dev_err (&pdev->dev,"no platform data defined\n" ); +if (IS_ERR (pdata))return PTR_ERR (pdata); - } }else if (!pdata->keymap_data) {dev_err (&pdev->dev,"no keymap data defined\n" );return -EINVAL ;
drivers/input/mouse/elan_i2c_core.c +3 -0
@@ -1348,6 +1348,9 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0618", 0 }, { "ELAN061C", 0 }, { "ELAN061D", 0 }, + { "ELAN061E", 0 }, + { "ELAN0620", 0 }, + { "ELAN0621", 0 }, { "ELAN0622", 0 }, { "ELAN1000", 0 }, { }
drivers/input/mouse/synaptics.c +1 -0
@@ -170,6 +170,7 @@ static const char * const smbus_pnp_ids[] = {"LEN0048" ,/* X1 Carbon 3 */ "LEN0046" ,/* X250 */ "LEN004a" ,/* W541 */ +"LEN005b" ,/* P50 */ "LEN0071" ,/* T480 */ "LEN0072" ,/* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */ "LEN0073", /* X1 Carbon G5 (Elantech) */
drivers/mtd/nand/bbt.c +2 -1
@@ -27,7 +27,8 @@ int nanddev_bbt_init(struct nand_device *nand)unsigned int nwords =DIV_ROUND_UP (nblocks * bits_per_block,BITS_PER_LONG ); - nand->bbt.cache =kzalloc (nwords,GFP_KERNEL ); + nand->bbt.cache =kcalloc (nwords,sizeof (*nand->bbt.cache), +GFP_KERNEL );if (!nand->bbt.cache)return -ENOMEM ;
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -1409,7 +1409,7 @@ void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f) } vsi->flags |=I40E_VSI_FLAG_FILTER_CHANGED ; -set_bit (__I40E_MACVLAN_SYNC_PENDING, vsi->state); +set_bit (__I40E_MACVLAN_SYNC_PENDING, vsi->back->state); }/**
drivers/scsi/lpfc/lpfc_init.c +5 -1
@@ -167,7 +167,11 @@ lpfc_config_port_prep(struct lpfc_hba *phba) sizeof(phba->wwpn)); } - phba->sli3_options =0x0 ; +/* +* Clear all option bits except LPFC_SLI3_BG_ENABLED, +* which was already set in lpfc_get_cfgparam() +*/ + phba->sli3_options &= (uint32_t )LPFC_SLI3_BG_ENABLED ;/* Setup and issue mailbox READ REV command */ lpfc_read_rev (phba, pmb);
drivers/scsi/lpfc/lpfc_sli.c +0 -1
@@ -4969,7 +4969,6 @@ lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode) phba->sli3_options &= ~(LPFC_SLI3_NPIV_ENABLED |LPFC_SLI3_HBQ_ENABLED |LPFC_SLI3_CRP_ENABLED | -LPFC_SLI3_BG_ENABLED |LPFC_SLI3_DSS_ENABLED );if (rc !=MBX_SUCCESS ) { lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
drivers/tty/serial/kgdboc.c +21 -22
66 lines not on this page · raw message
fs/btrfs/tree-checker.c +3 -5
@@ -389,13 +389,11 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info,/* * Here we don't really care about alignment since extent allocator can -* handle it. We care more about the size, as if one block group is -* larger than maximum size, it's must be some obvious corruption. +* handle it. We care more about the size. */ -if (key->offset >BTRFS_MAX_DATA_CHUNK_SIZE || key->offset ==0 ) { +if (key->offset ==0 ) {block_group_err (fs_info, leaf, slot, -"invalid block group size, have %llu expect (0, %llu]" , - key->offset,BTRFS_MAX_DATA_CHUNK_SIZE ); +"invalid block group size 0" );return -EUCLEAN ; }
include/linux/tracepoint.h +3 -3
@@ -166,7 +166,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)struct tracepoint_func *it_func_ptr; \void *it_func; \void *__data; \ - int __maybe_unused idx = 0; \ + int __maybe_unused __idx = 0; \ \if (!(cond)) \return ; \
@@ -182,7 +182,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)* doesn't work from the idle path. \ */ \if (rcuidle) { \ - idx =srcu_read_lock_notrace (&tracepoint_srcu); \ + __idx =srcu_read_lock_notrace (&tracepoint_srcu);\rcu_irq_enter_irqson (); \ } \ \
@@ -198,7 +198,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) \if (rcuidle) { \rcu_irq_exit_irqson (); \ -srcu_read_unlock_notrace (&tracepoint_srcu, idx);\ +srcu_read_unlock_notrace (&tracepoint_srcu, __idx);\ } \ \preempt_enable_notrace (); \
include/trace/events/sched.h +11 -1
@@ -107,6 +107,8 @@ DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new,#ifdef CREATE_TRACE_POINTS static inline long __trace_sched_switch_state (bool preempt,struct task_struct *p) { +unsigned int state; +#ifdef CONFIG_SCHED_DEBUG BUG_ON (p != current);#endif /* CONFIG_SCHED_DEBUG */
@@ -118,7 +120,15 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct *if (preempt)return TASK_REPORT_MAX ; - return 1 << task_state_index(p); +/* +* task_state_index() uses fls() and returns a value from 0-8 range. +* Decrement it by 1 (except TASK_RUNNING state i.e 0) before using +* it for left shift operation to get the correct task->state +* mapping. +*/ + state =task_state_index (p); + + return state ? (1 << (state - 1)) : state; }#endif /* CREATE_TRACE_POINTS */
kernel/events/uprobes.c +10 -2
@@ -616,7 +616,7 @@ static int prepare_uprobe(struct uprobe *uprobe, struct file *file,BUG_ON ((uprobe->offset & ~PAGE_MASK ) +UPROBE_SWBP_INSN_SIZE >PAGE_SIZE ); -smp_wmb ();/* pairs with rmb() in find_active_uprobe() */ +smp_wmb ();/* pairs with the smp_rmb() in handle_swbp() */ set_bit (UPROBE_COPY_INSN , &uprobe->flags); out:
@@ -1914,10 +1914,18 @@ static void handle_swbp(struct pt_regs *regs)* After we hit the bp, _unregister + _register can install the * new and not-yet-analyzed uprobe at the same address, restart. */ -smp_rmb ();/* pairs with wmb() in install_breakpoint() */ if (unlikely (!test_bit (UPROBE_COPY_INSN , &uprobe->flags))) goto out; +/* +* Pairs with the smp_wmb() in prepare_uprobe(). +* +* Guarantees that if we see the UPROBE_COPY_INSN bit set, then +* we must also see the stores to &uprobe->arch performed by the +* prepare_uprobe() call. +*/ +smp_rmb (); +/* Tracing handlers use ->utask to communicate with fetch methods */ if (!get_utask ()) goto out;
kernel/trace/trace.h +54 -3
106 lines not on this page · raw message
kernel/trace/trace_functions_graph.c +4 -0
@@ -509,6 +509,8 @@ void trace_graph_return(struct ftrace_graph_ret *trace)int cpu;int pc; +ftrace_graph_addr_finish (trace); +local_irq_save (flags); cpu =raw_smp_processor_id (); data =per_cpu_ptr (tr->trace_buffer.data, cpu);
@@ -532,6 +534,8 @@ void set_graph_array(struct trace_array *tr)static void trace_graph_thresh_return (struct ftrace_graph_ret *trace) { +ftrace_graph_addr_finish (trace); +if (tracing_thresh && (trace->rettime - trace->calltime < tracing_thresh))return ;
kernel/trace/trace_irqsoff.c +2 -0
@@ -208,6 +208,8 @@ static void irqsoff_graph_return(struct ftrace_graph_ret *trace)unsigned long flags;int pc; +ftrace_graph_addr_finish (trace); +if (!func_prolog_dec (tr, &data, &flags))return ;
kernel/trace/trace_sched_wakeup.c +2 -0
@@ -270,6 +270,8 @@ static void wakeup_graph_return(struct ftrace_graph_ret *trace)unsigned long flags;int pc; +ftrace_graph_addr_finish (trace); +if (!func_prolog_preempt_disable (tr, &data, &pc))return ;
lib/test_hexdump.c +1 -1
@@ -99,7 +99,7 @@ static void __init test_hexdump_prepare_test(size_t len, int rowsize,const char *q = *result++;size_t amount =strlen (q); -strncpy (p, q, amount); +memcpy (p, q, amount); p += amount; *p++ =' ' ;
mm/hugetlb.c +1 -1
@@ -4080,7 +4080,7 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm,/* fallback to copy_from_user outside mmap_sem */ if (unlikely (ret)) { - ret = -EFAULT ; + ret = -ENOENT ; *pagep = page;/* don't free the page */ goto out;
mm/shmem.c +28 -3
@@ -2264,6 +2264,7 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,struct page *page;pte_t _dst_pte, *dst_pte;int ret; +pgoff_t offset, max_off; ret = -ENOMEM ;if (!shmem_inode_acct_block (inode,1 ))
@@ -2286,7 +2287,7 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, *pagep = page;shmem_inode_unacct_blocks (inode,1 );/* don't free the page */ -return -EFAULT ; +return -ENOENT ; } }else {/* mfill_zeropage_atomic */ clear_highpage (page);
@@ -2301,6 +2302,12 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,__SetPageSwapBacked (page);__SetPageUptodate (page); + ret = -EFAULT ; + offset =linear_page_index (dst_vma, dst_addr); + max_off =DIV_ROUND_UP (i_size_read (inode),PAGE_SIZE ); +if (unlikely (offset >= max_off)) + goto out_release; + ret =mem_cgroup_try_charge_delay (page, dst_mm, gfp, &memcg, false);if (ret) goto out_release;
@@ -2318,9 +2325,25 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, _dst_pte =mk_pte (page, dst_vma->vm_page_prot);if (dst_vma->vm_flags &VM_WRITE ) _dst_pte =pte_mkwrite (pte_mkdirty (_dst_pte)); +else { +/* +* We don't set the pte dirty if the vma has no +* VM_WRITE permission, so mark the page dirty or it +* could be freed from under us. We could do it +* unconditionally before unlock_page(), but doing it +* only if VM_WRITE is not set is faster. +*/ +set_page_dirty (page); + } - ret = -EEXIST ; dst_pte =pte_offset_map_lock (dst_mm, dst_pmd, dst_addr, &ptl); + + ret = -EFAULT ; + max_off =DIV_ROUND_UP (i_size_read (inode),PAGE_SIZE ); +if (unlikely (offset >= max_off)) + goto out_release_uncharge_unlock; + + ret = -EEXIST ;if (!pte_none (*dst_pte)) goto out_release_uncharge_unlock;
@@ -2338,13 +2361,15 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,/* No need to invalidate - it was non-present before */ update_mmu_cache (dst_vma, dst_addr, dst_pte); -unlock_page (page);pte_unmap_unlock (dst_pte, ptl); +unlock_page (page); ret =0 ; out:return ret; out_release_uncharge_unlock:pte_unmap_unlock (dst_pte, ptl); +ClearPageDirty (page); +delete_from_page_cache (page); out_release_uncharge:mem_cgroup_cancel_charge (page, memcg, false); out_release:
mm/userfaultfd.c +40 -7
100 lines not on this page · raw message
net/tipc/topsrv.c +1 -1
@@ -657,7 +657,7 @@ int tipc_topsrv_start(struct net *net) srv->max_rcvbuf_size =sizeof (struct tipc_subscr );INIT_WORK (&srv->awork, tipc_topsrv_accept); -strncpy (srv->name, name,strlen (name) +1 ); +strscpy (srv->name, name,sizeof (srv->name)); tn->topsrv = srv;atomic_set (&tn->subscription_count,0 );
scripts/unifdef.c +2 -2
@@ -395,7 +395,7 @@ usage(void)* When we have processed a group that starts off with a known-false * #if/#elif sequence (which has therefore been deleted) followed by a * #elif that we don't understand and therefore must keep, we edit the -* latter into a #if to keep the nesting correct. We use strncpy() to +* latter into a #if to keep the nesting correct. We use memcpy() to * overwrite the 4 byte token "elif" with "if " without a '\0' byte. * * When we find a true #elif in a group, the following block will
@@ -450,7 +450,7 @@ static void Idrop (void) { Fdrop(); ignoreon(); }static void Itrue (void ) {Ftrue ();ignoreon (); }static void Ifalse (void ) {Ffalse ();ignoreon (); }/* modify this line */ -static void Mpass (void ) {strncpy (keyword,"if " ,4 );Pelif (); } +static void Mpass (void ) {memcpy (keyword,"if " ,4 );Pelif (); }static void Mtrue (void ) {keywordedit ("else" );state (IS_TRUE_MIDDLE ); }static void Melif (void ) {keywordedit ("endif" );state (IS_FALSE_TRAILER ); }static void Melse (void ) {keywordedit ("endif" );state (IS_FALSE_ELSE ); }
security/selinux/nlmsgtab.c +12 -1
@@ -80,6 +80,9 @@ static const struct nlmsg_perm nlmsg_route_perms[] = { RTM_NEWSTATS, NETLINK_ROUTE_SOCKET__NLMSG_READ }, { RTM_GETSTATS, NETLINK_ROUTE_SOCKET__NLMSG_READ }, { RTM_NEWCACHEREPORT, NETLINK_ROUTE_SOCKET__NLMSG_READ }, + { RTM_NEWCHAIN, NETLINK_ROUTE_SOCKET__NLMSG_WRITE }, + { RTM_DELCHAIN, NETLINK_ROUTE_SOCKET__NLMSG_WRITE }, + { RTM_GETCHAIN, NETLINK_ROUTE_SOCKET__NLMSG_READ }, }; static const struct nlmsg_perm nlmsg_tcpdiag_perms[] =
@@ -158,7 +161,11 @@ int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm)switch (sclass) {case SECCLASS_NETLINK_ROUTE_SOCKET : -/* RTM_MAX always point to RTM_SETxxxx, ie RTM_NEWxxx + 3 */ +/* RTM_MAX always points to RTM_SETxxxx, ie RTM_NEWxxx + 3. +* If the BUILD_BUG_ON() below fails you must update the +* structures at the top of this file with the new mappings +* before updating the BUILD_BUG_ON() macro! +*/ BUILD_BUG_ON (RTM_MAX != (RTM_NEWCHAIN +3 )); err =nlmsg_perm (nlmsg_type, perm, nlmsg_route_perms,sizeof (nlmsg_route_perms));
@@ -170,6 +177,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm)break ;case SECCLASS_NETLINK_XFRM_SOCKET : +/* If the BUILD_BUG_ON() below fails you must update the +* structures at the top of this file with the new mappings +* before updating the BUILD_BUG_ON() macro! +*/ BUILD_BUG_ON (XFRM_MSG_MAX !=XFRM_MSG_MAPPING ); err =nlmsg_perm (nlmsg_type, perm, nlmsg_xfrm_perms,sizeof (nlmsg_xfrm_perms));