tag | a269615c4282cb85316dcee89eacd4c8696be8f3 | |
---|---|---|
tagger | Lee Jones <joneslee@google.com> | Tue Mar 07 11:27:00 2023 +0000 |
object | b62f2af118c8c313a9028bfd346cb4cfa31274db |
https://source.android.com/docs/security/bulletin/2023-03-01 CVE-2021-33655
commit | b62f2af118c8c313a9028bfd346cb4cfa31274db | [log] [tgz] |
---|---|---|
author | Vaisakh Murali <vaisakhmurali@gmail.com> | Wed Mar 01 12:27:17 2023 +0000 |
committer | Vaisakh Murali <vaisakhmurali@gmail.com> | Wed Mar 01 19:22:22 2023 +0600 |
tree | 6b7ea3d360d9cea5200d12fc62579799c0c8bff1 | |
parent | 9f71ba69cd7503966a87cf6a43a44fb3ced472fb [diff] |
ANDROID: fs/f2fs: fixup __f2fs_cluster_blocks with F2FS_FS_COMPRESSION Commit 3cf0f8245dbc54c81b8994d530e47232be36e5eb introduced `inode` as a parameter to F2FS_I_SB() but never declared from where it was supposed to be accessed from. This leads to a compile error with CONFIG_F2FS_FS_COMPRESSION enabled: In file included from fs/f2fs/compress.c:17: fs/f2fs/compress.c: In function '__f2fs_cluster_blocks': fs/f2fs/compress.c:813:39: error: 'inode' undeclared (first use in this function) 813 | f2fs_bug_on(F2FS_I_SB(inode), | ^~~~~ fs/f2fs/f2fs.h:38:38: note: in definition of macro 'f2fs_bug_on' 38 | set_sbi_flag(sbi, SBI_NEED_FSCK); \ | ^~~ fs/f2fs/compress.c:813:39: note: each undeclared identifier is reported only once for each function it appears in 813 | f2fs_bug_on(F2FS_I_SB(inode), | ^~~~~ fs/f2fs/f2fs.h:38:38: note: in definition of macro 'f2fs_bug_on' 38 | set_sbi_flag(sbi, SBI_NEED_FSCK); \ | Test: Enable CONFIG_F2FS_FS_COMPRESSION, check compile. Fixes: 3cf0f8245dbc54c81b8994d530e47232be36e5eb ("BACKPORT: f2fs: compress: remove unneeded preallocation") Change-Id: I40015a66b8b872c86ff782b30581b24f752bb19a Signed-off-by: Vaisakh Murali <vaisakhmurali@gmail.com>
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.
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.
script/checkpatch.pl
UPSTREAM:
, BACKPORT:
, FROMGIT:
, FROMLIST:
, or ANDROID:
.Change-Id:
tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)Bug:
tag.Signed-off-by:
tag by the author and the submitterAdditional requirements are listed below based on patch type
UPSTREAM:
, BACKPORT:
UPSTREAM:
.(cherry-picked from ...)
lineimportant 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 c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT:
instead of UPSTREAM:
.UPSTREAM:
(cherry-picked from ...)
lineBACKPORT: 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 c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) [ Resolved minor conflict in drivers/foo/bar.c ] Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMGIT:
, FROMLIST:
,FROMGIT:
(cherry picked from commit <sha1> <repo> <branch>)
. This must be a stable maintainer branch (not rebased, so don't use linux-next
for example).BACKPORT: FROMGIT:
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>
FROMLIST:
Link:
tag with a link to the submittal on lore.kernel.orgBACKPORT: FROMLIST:
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>
ANDROID:
ANDROID:
Fixes:
tag that cites the patch with the bugANDROID: 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>
ANDROID:
Bug:
tag with the Android bug (required for android-specific features)