Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bcd5afe authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.42 (66aebe2d) into msm-4.19 



* refs/heads/tmp-66aebe2d:
  Linux 4.19.42
  arm64: futex: Bound number of LDXR/STXR loops in FUTEX_WAKE_OP
  locking/futex: Allow low-level atomic operations to return -EAGAIN
  ASoC: Intel: avoid Oops if DMA setup fails
  UAS: fix alignment of scatter/gather segments
  Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
  Bluetooth: hidp: fix buffer overflow
  scsi: qla2xxx: Fix device staying in blocked state
  scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
  scsi: lpfc: change snprintf to scnprintf for possible overflow
  soc: sunxi: Fix missing dependency on REGMAP_MMIO
  cpufreq: armada-37xx: fix frequency calculation for opp
  intel_th: pci: Add Comet Lake support
  usb-storage: Set virt_boundary_mask to avoid SG overflows
  USB: cdc-acm: fix unthrottle races
  USB: serial: f81232: fix interrupt worker not stop
  usb: dwc3: Fix default lpm_nyet_threshold value
  genirq: Prevent use-after-free and work list corruption
  iommu/amd: Set exclusion range correctly
  perf/core: Fix perf_event_disable_inatomic() race
  platform/x86: pmc_atom: Drop __initconst on dmi table
  nvme-fc: correct csn initialization and increments on error
  virtio-blk: limit number of hw queues by nr_cpu_ids
  ASoC: Intel: kbl: fix wrong number of channels
  drm/mediatek: fix possible object reference leak
  scsi: csiostor: fix missing data copy in csio_scsi_err_handler()
  RDMA/hns: Fix bug that caused srq creation to fail
  RDMA/vmw_pvrdma: Fix memory leak on pvrdma_pci_remove
  virtio_pci: fix a NULL pointer reference in vp_del_vqs
  drm/sun4i: tcon top: Fix NULL/invalid pointer dereference in sun8i_tcon_top_un/bind
  slab: fix a crash by reading /proc/slab_allocators
  objtool: Add rewind_stack_do_exit() to the noreturn list
  ASoC: cs35l35: Disable regulators on driver removal
  drm/amd/display: fix cursor black issue
  ASoC: rockchip: pdm: fix regmap_ops hang issue
  linux/kernel.h: Use parentheses around argument in u64_to_user_ptr()
  perf/x86/intel: Initialize TFA MSR
  perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS
  drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata()
  ASoC: tlv320aic32x4: Fix Common Pins
  MIPS: KGDB: fix kgdb support for SMP platforms.
  IB/hfi1: Fix the allocation of RSM table
  IB/hfi1: Eliminate opcode tests on mr deref
  drm/omap: hdmi4_cec: Fix CEC clock handling for PM
  ASoC: dapm: Fix NULL pointer dereference in snd_soc_dapm_free_kcontrol
  ASoC: cs4270: Set auto-increment bit for register writes
  ASoC: stm32: dfsdm: fix debugfs warnings on entry creation
  ASoC: stm32: dfsdm: manage multiple prepare
  clk: meson-gxbb: round the vdec dividers to closest
  ASoC: wm_adsp: Add locking to wm_adsp2_bus_error
  ASoC: rt5682: recording has no sound after booting
  ASoC: samsung: odroid: Fix clock configuration for 44100 sample rate
  ASoC: nau8810: fix the issue of widget with prefixed name
  ASoC: nau8824: fix the issue of the widget with prefix name
  ASoC:intel:skl:fix a simultaneous playback & capture issue on hda platform
  ASoC:soc-pcm:fix a codec fixup issue in TDM case
  ASoC: stm32: sai: fix exposed capabilities in spdif mode
  ASoC: stm32: sai: fix iec958 controls indexation
  ASoC: hdmi-codec: fix S/PDIF DAI
  ASoC: tlv320aic3x: fix reset gpio reference counting
  staging: most: cdev: fix chrdev_region leak in mod_exit
  staging: greybus: power_supply: fix prop-descriptor request size
  ubsan: Fix nasty -Wbuiltin-declaration-mismatch GCC-9 warnings
  Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup()
  scsi: libsas: fix a race condition when smp task timeout
  net: stmmac: Use bfsize1 in ndesc_init_rx_desc
  ANDROID: block/cfq-iosched: make group_idle per io cgroup tunable
  ANDROID: cuttlefish_defconfig: Enable CONFIG_CGROUP_SCHEDTUNE
  fscrypt: remove filesystem specific build config option
  f2fs: use IS_ENCRYPTED() to check encryption status
  ext4: use IS_ENCRYPTED() to check encryption status
  fscrypt: return -EXDEV for incompatible rename or link into encrypted dir
  fscrypt: remove CRYPTO_CTR dependency
  fscrypt: add Adiantum support
  crypto: speck - remove Speck

Conflicts:
	fs/crypto/fscrypt_private.h
	fs/ext4/inode.c
	include/linux/fscrypt_supp.h
	kernel/irq/manage.c

Change-Id: I08093f45a8a82bdb85ace0968863545cb329baaa
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 1ff48618 66aebe2d

Documentation/filesystems/fscrypt.rst

+12 −4
Original line number Diff line number Diff line
@@ -343,9 +343,9 @@ FS_IOC_SET_ENCRYPTION_POLICY can fail with the following errors: 
- ``ENOTEMPTY``: the file is unencrypted and is a nonempty directory

- ``ENOTTY``: this type of filesystem does not implement encryption

- ``EOPNOTSUPP``: the kernel was not configured with encryption

  support for this filesystem, or the filesystem superblock has not

  support for filesystems, or the filesystem superblock has not

  had encryption enabled on it.  (For example, to use encryption on an

  ext4 filesystem, CONFIG_EXT4_ENCRYPTION must be enabled in the

  ext4 filesystem, CONFIG_FS_ENCRYPTION must be enabled in the

  kernel config, and the superblock must have had the "encrypt"

  feature flag enabled using ``tune2fs -O encrypt`` or ``mkfs.ext4 -O

  encrypt``.)
@@ -451,10 +451,18 @@ astute users may notice some differences in behavior: 
- Unencrypted files, or files encrypted with a different encryption

  policy (i.e. different key, modes, or flags), cannot be renamed or

  linked into an encrypted directory; see `Encryption policy

  enforcement`_.  Attempts to do so will fail with EPERM.  However,

  enforcement`_.  Attempts to do so will fail with EXDEV.  However,

  encrypted files can be renamed within an encrypted directory, or

  into an unencrypted directory.



  Note: "moving" an unencrypted file into an encrypted directory, e.g.

  with the `mv` program, is implemented in userspace by a copy

  followed by a delete.  Be aware that the original unencrypted data

  may remain recoverable from free space on the disk; prefer to keep

  all files encrypted from the very beginning.  The `shred` program

  may be used to overwrite the source files but isn't guaranteed to be

  effective on all filesystems and storage devices.



- Direct I/O is not supported on encrypted files.  Attempts to use

  direct I/O on such files will fall back to buffered I/O.
@@ -541,7 +549,7 @@ not be encrypted. 
Except for those special files, it is forbidden to have unencrypted

files, or files encrypted with a different encryption policy, in an

encrypted directory tree.  Attempts to link or rename such a file into

an encrypted directory will fail with EPERM.  This is also enforced

an encrypted directory will fail with EXDEV.  This is also enforced

during ->lookup() to provide limited protection against offline

attacks that try to disable or downgrade encryption in known locations

where applications may later write sensitive data.  It is recommended

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 41

SUBLEVEL = 42

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -622,12 +622,9 @@ CONFIG_SENSORS_SSC=y 
CONFIG_QCOM_KGSL=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

arch/arm64/configs/vendor/kona_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -645,12 +645,9 @@ CONFIG_SENSORS_SSC=y 
CONFIG_QCOM_KGSL=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_EXT4_FS_ENCRYPTION=y

CONFIG_EXT4_FS_ICE_ENCRYPTION=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y

arch/arm64/configs/vendor/lito-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ CONFIG_EXT4_FS=y 
CONFIG_EXT4_FS_SECURITY=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_F2FS_FS_ENCRYPTION=y

CONFIG_FS_ENCRYPTION=y

CONFIG_QUOTA=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V2=y