github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-29 18:51:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
Linux kernel source tree
1,129,890 Commits 1 Branch 940 Tags 24 GiB
C 96.9%
Assembly 0.9%
Rust 0.6%
Shell 0.6%
Python 0.5%
Other 0.3%
482c42cf37
Go to file
Chris Lew 482c42cf37 net: qrtr: Update data_len when padding large skbs 
When the skb is greater than 16kb and needs to by padded, qrtr attempts
to manually pad the trailing bytes to be zeroed out and word aligned.

The padding of the page was happening correctly, but the bookkeeping on
the skb was not accurate. When skb->len was updated to account for the
new padding but skb->data_len was not, this made all skb functions
think the linear portion (skb->len - skb_data_len) was longer than it
actually was. This caused a pattern where skb_copy_bits() would copy
out of bounds on the linear section and shift the trailing bits into
the padded section.

Before padding without updating data_len.
 [  104.825620] qrtr: 00003e80: 66 d3 a0 e1 b6 04 e4 43 b7 aa f0 40 fb eb 38 dc
 [  104.825622] qrtr: 00003e90: f1 91 85 e5 17 26 2a a2 11 49 bc cc bd f3 d3 23
 [  104.825624] qrtr: 00003ea0: c6.

Adter padding without updating data_len.
 [  104.860041] qrtr: 00003e80: 66 d3 a0 e1 b6 04 e4 43 b7 aa f0 40 fb eb 38 dc
 [  104.860042] qrtr: 00003e90: f1 91 85 e5 17 26 2a a2 11 49 bc cc bd 00 00 00
 [  104.860043] qrtr: 00003ea0: f3 d3 23 c6.

Change-Id: I6c1c944ecf696360ada263046b0e0af1bfdeb505
Signed-off-by: Chris Lew <quic_clew@quicinc.com>
2022-11-02 16:05:05 -07:00
android android: abi_gki_aarch64_qcom: Add skb symbols 2022-11-02 16:04:14 -07:00
arch Merge "defconfig: pineapple-gki: Enable our IOMMU debug module" 2022-10-26 09:48:11 -07:00
block Merge 105a36f369 ("Merge tag 'kbuild-fixes-v6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild") into android-mainline 2022-09-25 13:23:30 +02:00
certs Merge keystone/android-mainline-keystone-qcom-release.6.0 (dcb3fbd) into msm-pineapple 2022-10-23 23:33:09 -07:00
crypto Merge tag 'v6.0-rc1' into android-mainline 2022-08-25 12:19:15 +02:00
Documentation Merge keystone/android-mainline-keystone-qcom-release.6.0 (dcb3fbd) into msm-pineapple 2022-10-23 23:33:09 -07:00
drivers Merge "coresight-stm: fix list_add double add issue" 2022-10-26 09:48:14 -07:00
fs Merge ffb4d94b43 ("Merge tag 'drm-fixes-2022-10-01' of git://anongit.freedesktop.org/drm/drm") into android-mainline 2022-10-01 12:11:10 +02:00
include net: qrtr: Add support for DEL_PROC control message 2022-10-27 11:09:10 -07:00
init Merge keystone/android-mainline-keystone-qcom-release.6.0 (dcb3fbd) into msm-pineapple 2022-10-23 23:33:09 -07:00
io_uring io_uring-6.0-2022-09-29 2022-09-30 09:28:39 -07:00
ipc Updates to various subsystems which I help look after. lib, ocfs2, 2022-08-07 10:03:24 -07:00
kernel Merge "sched/walt: Change to comparing capacities instead of clusters" 2022-10-25 14:28:10 -07:00
lib Makefile.debug: re-enable debug info for .S files 2022-09-24 11:19:19 +09:00
LICENSES LICENSES/LGPL-2.1: Add LGPL-2.1-or-later as valid identifiers 2021-12-16 14:33:10 +01:00
mm Merge keystone/mirror-android-mainline into keystone/android-mainline-keystone-qcom-dev 2022-10-05 11:10:16 -07:00
net net: qrtr: Update data_len when padding large skbs 2022-11-02 16:05:05 -07:00
samples Tracing updates for 5.20 / 6.0 2022-08-05 09:41:12 -07:00
scripts Merge keystone/android-mainline-keystone-qcom-release.6.0 (dcb3fbd) into msm-pineapple 2022-10-23 23:33:09 -07:00
security Merge d895ec7938 ("Merge tag 'block-6.0-2022-09-02' of git://git.kernel.dk/linux-block") into android-mainline 2022-09-03 12:19:57 +02:00
sound Merge 49c13ed031 ("Merge tag 'soc-fixes-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc") into android-mainline 2022-09-28 10:59:58 +02:00
tools Merge 9388076b4c ("Merge tag 'acpi-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline 2022-10-04 14:39:52 +02:00
usr Not a lot of material this cycle. Many singleton patches against various 2022-05-27 11:22:03 -07:00
virt KVM: Drop unnecessary initialization of "ops" in kvm_ioctl_create_device() 2022-08-19 04:05:43 -04:00
.clang-format PCI/DOE: Add DOE mailbox support functions 2022-07-19 15:38:04 -07:00
.cocciconfig
.get_maintainer.ignore get_maintainer: add Alan to .get_maintainer.ignore 2022-08-20 15:17:44 -07:00
.gitattributes
.gitignore Merge keystone/android-mainline-keystone-qcom-release.5.18.0 (36fb3cb) into msm-pineapple 2022-07-02 19:01:14 -07:00
.mailmap Qualcomm ARM64 DTS fixes for 6.0 2022-09-23 16:44:37 +02:00
Android.bp kernel: Create and export kernel headers 2022-05-31 18:19:41 -07:00
bazel.WORKSPACE build: Add custom bazel.WORKSPACE file 2022-10-19 16:52:01 -07:00
build_with_bazel.py build: Add build_with_bazel.py 2022-10-20 12:01:13 -07:00
BUILD.bazel ANDROID: kleaf: add 16k variant of kernel_aarch64 2022-10-03 16:53:02 +00:00
build.config.aarch64 ANDROID: build.config: set NDK_TRIPLE 2022-04-05 14:09:03 -07:00
build.config.allmodconfig Revert "ANDROID: disable PINCTRL_THUNDERBAY from allmodconfig builds" 2022-04-07 15:46:34 +00:00
build.config.allmodconfig.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.allmodconfig.arm ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.allmodconfig.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.amlogic ANDROID: GKI: amlogic: add DTB overlays 2021-02-11 12:23:26 +00:00
build.config.arm ANDROID: build.config: set NDK_TRIPLE 2022-04-05 14:09:03 -07:00
build.config.common ANDROID: fix KCFLAGS override by __ANDROID_COMMON_KERNEL__ 2022-04-29 17:50:28 +00:00
build.config.constants ANDROID: clang: update to 15.0.1 2022-09-07 15:50:48 +00:00
build.config.db845c ANDROID: Convert db845c to a mixed build. 2022-09-06 23:21:51 +00:00
build.config.gki ANDROID: GKI: Add support for a GKI_BUILD_CONFIG_FRAGMENT 2021-06-24 00:26:54 +00:00
build.config.gki_consolidate.aarch64 ANDROID: qki: Add consolidate config 2021-06-21 15:04:54 -07:00
build.config.gki_kasan ANDROID: build.config: re-disable LTO properly for KASAN 2022-03-24 12:41:35 -07:00
build.config.gki_kasan.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki_kasan.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki_kprobes ANDROID: build.configs: migrate away from CC_LD_ARG 2021-07-02 09:49:23 +00:00
build.config.gki_kprobes.aarch64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-01 15:29:45 +00:00
build.config.gki_kprobes.x86_64 ANDROID: Adding kprobes build configs for Cuttlefish 2021-03-01 15:29:45 +00:00
build.config.gki-debug.aarch64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki-debug.x86_64 ANDROID: drop KERNEL_DIR setting in build.config.common 2020-08-31 15:20:37 +00:00
build.config.gki.aarch64 ANDROID: Adding Image.gz and boot-gz.img 2022-06-13 10:00:31 +00:00
build.config.gki.aarch64.16k ANDROID: 16k target: don't write defconfig to source tree 2022-10-03 11:24:35 -07:00
build.config.gki.x86_64 ANDROID: Enable BUILD_GKI_CERTIFICATION_TOOLS for x86_64 GKI 2022-09-22 13:17:50 +00:00
build.config.khwasan ANDROID: Add a build config fragment for KHWASan. 2021-10-13 19:44:44 +00:00
build.config.msm.common Merge "build.config.msm.common: Fix corner case in copy_dist_bins()" 2022-10-26 09:48:10 -07:00
build.config.msm.gki build.config: Remove the generation of system_dlkm twice 2022-10-17 15:17:41 -07:00
build.config.msm.kalama build.config: Remove the generation of system_dlkm twice 2022-10-17 15:17:41 -07:00
build.config.msm.kalama.oemvm config: Add build config for kkp oemvm 2022-09-05 19:51:04 -07:00
build.config.msm.kalama.tuivm config: Add build config and defconfig for kkp 2022-09-08 02:20:39 -07:00
build.config.msm.kalama.vm config: Add build config and defconfig for kkp 2022-09-08 02:20:39 -07:00
build.config.msm.pineapple build.config: Remove the generation of system_dlkm twice 2022-10-17 15:17:41 -07:00
build.config.msm.pineapple.oemvm build: config: Adding build configs for pineapple oemvm 2022-09-05 18:20:59 -07:00
build.config.msm.pineapple.tuivm build: config: Adding build configs for vm and pineapple tuivm 2022-08-11 01:46:21 -07:00
build.config.msm.pineapple.vm build.config.msm.pineapple.vm: Introduce PREFERRED_USERSPACE 2022-08-18 01:10:19 -07:00
build.config.msm.vm build: config: Adding build configs for vm and pineapple tuivm 2022-08-11 01:46:21 -07:00
build.config.rockpi4 ANDROID: rockpi4: Use new DTS_EXT_DIR feature 2021-12-13 21:27:46 +00:00
build.config.x86_64 ANDROID: build.config: set NDK_TRIPLE 2022-04-05 14:09:03 -07:00
build.targets build.targets: Add pineapple and kkp vm to build target 2022-09-12 07:41:05 -07:00
COPYING COPYING: state that all contributions really are covered by this file 2020-02-10 13:32:20 -08:00
CREDITS drm for 5.20/6.0 2022-08-03 19:52:08 -07:00
files_gki_aarch64.txt Merge keystone/android-mainline-keystone-qcom-release.6.0 (dcb3fbd) into msm-pineapple 2022-10-23 23:33:09 -07:00
Kbuild kbuild: rename hostprogs-y/always to hostprogs/always-y 2020-02-04 01:53:07 +09:00
Kconfig sched/walt: Introduce WALT as a module 2022-06-28 18:45:55 -07:00
Kconfig.ext ANDROID: kbuild: add Kconfig support for external modules 2021-12-13 18:33:18 +00:00
MAINTAINERS Merge 9388076b4c ("Merge tag 'acpi-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm") into android-mainline 2022-10-04 14:39:52 +02:00
Makefile Merge keystone/android-mainline-keystone-qcom-release.6.0 (dcb3fbd) into msm-pineapple 2022-10-23 23:33:09 -07:00
modules.list.msm.kalama modules.list.msm.pineapple: Add interconnect common module 2022-09-30 02:03:44 -07:00
modules.list.msm.pineapple Merge "modules.list.msm.pineapple: Add crm driver" 2022-10-25 14:28:01 -07:00
modules.systemdlkm_blocklist.msm.pineapple build.config.msm.pineapple: Enable system_dlkm partition 2022-10-17 15:16:36 -07:00
modules.vendor_blocklist.msm.kalama build.config: Add msm.kalama target and modules blacklist 2022-07-22 13:55:27 -07:00
modules.vendor_blocklist.msm.pineapple build.config: Add msm.pineapple target and modules blacklist 2022-03-07 10:31:33 -08:00
OWNERS ANDROID: add smuckle to OWNERS 2022-06-18 10:41:40 -07:00
OWNERS_DrNo ANDROID: Updating OWNERS_DrNo 2022-08-22 16:34:52 +00:00
README
README.md ANDROID: README.md: fix checkpatch.pl path typo 2021-04-07 23:16:50 +00:00

README.md

How do I submit patches to Android Common Kernels

  1. BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.

    • Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux, additions of EXPORT_SYMBOL_GPL() require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.
    • When sending patches upstream, the commit message must contain a clear case for why the patch is needed and beneficial to the community. Enabling out-of-tree drivers or functionality is not not a persuasive case.

  2. LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

  • All patches must conform to the Linux kernel coding standards and pass scripts/checkpatch.pl
  • Patches shall not break gki_defconfig or allmodconfig builds for arm, arm64, x86, x86_64 architectures (see https://source.android.com/setup/build/building-kernels)
  • If the patch is not merged from an upstream branch, the subject must be tagged with the type of patch: UPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.
  • All patches must have a Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)
  • If an Android bug has been assigned, there must be a Bug: tag.
  • All patches must have a Signed-off-by: tag by the author and the submitter

Additional requirements are listed below based on patch type

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

  • If the patch is a cherry-pick from Linux mainline with no changes at all
    • tag the patch subject with UPSTREAM:.
    • add upstream commit information with a (cherry picked from commit ...) line
    • Example:
      • if the upstream commit message is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        UPSTREAM: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch requires any changes from the upstream version, tag the patch with BACKPORT: instead of UPSTREAM:.
    • use the same tags as UPSTREAM:
    • add comments about the changes under the (cherry picked from commit ...) line
    • Example:
        BACKPORT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [joe: Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for other backports: FROMGIT:, FROMLIST:,

  • If the patch has been merged into an upstream maintainer tree, but has not yet been merged into Linux mainline
    • tag the patch subject with FROMGIT:
    • add info on where the patch came from as (cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).
    • if changes were required, use BACKPORT: FROMGIT:
    • Example:
      • if the commit message in the maintainer tree is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        FROMGIT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace
         https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch)
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch has been submitted to LKML, but not accepted into any maintainer tree
    • tag the patch subject with FROMLIST:
    • add a Link: tag with a link to the submittal on lore.kernel.org
    • add a Bug: tag with the Android bug (required for patches not accepted into a maintainer tree)
    • if changes were required, use BACKPORT: FROMLIST:
    • Example:
        FROMLIST: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for Android-specific patches: ANDROID:

  • If the patch is fixing a bug to Android-specific code
    • tag the patch subject with ANDROID:
    • add a Fixes: tag that cites the patch with the bug
    • Example:
        ANDROID: fix android-specific bug in foobar.c

        This is the detailed description of the important fix

        Fixes: 1234abcd2468 ("foobar: add cool feature")
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)