The patch titled Subject: vsprintf-remove-accidental-vla-usage-fix has been removed from the -mm tree. Its filename was vsprintf-remove-accidental-vla-usage-fix.patch This patch was dropped because it was folded into vsprintf-remove-accidental-vla-usage.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: vsprintf-remove-accidental-vla-usage-fix add comment Cc: "Gustavo A. R. Silva" <gustavo@xxxxxxxxxxxxxx> Cc: Jonathan Corbet <corbet@xxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Pantelis Antoniou <pantelis.antoniou@xxxxxxxxxxxx> Cc: Petr Mladek <pmladek@xxxxxxxx> Cc: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx> Cc: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/vsprintf.c | 1 + 1 file changed, 1 insertion(+) diff -puN lib/vsprintf.c~vsprintf-remove-accidental-vla-usage-fix lib/vsprintf.c --- a/lib/vsprintf.c~vsprintf-remove-accidental-vla-usage-fix +++ a/lib/vsprintf.c @@ -754,6 +754,7 @@ char *resource_string(char *buf, char *e #define FLAG_BUF_SIZE (2 * sizeof(res->flags)) #define DECODED_BUF_SIZE sizeof("[mem - 64bit pref window disabled]") #define RAW_BUF_SIZE sizeof("[mem - flags 0x]") +/* regular max() tricks gcc into creating a variable length array */ #define SIMPLE_MAX(x, y) ((x) > (y) ? (x) : (y)) char sym[SIMPLE_MAX(2*RSRC_BUF_SIZE + DECODED_BUF_SIZE, 2*RSRC_BUF_SIZE + FLAG_BUF_SIZE + RAW_BUF_SIZE)]; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch mm-memblock-hardcode-the-end_pfn-being-1-fix.patch mm-memblock-hardcode-the-end_pfn-being-1-fix-fix.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch mm.patch mm-initialize-pages-on-demand-during-boot-fix-4-fix.patch mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch mm-fix-races-between-swapoff-and-flush-dcache-fix.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-cgroup-aware-oom-killer-fix.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch vsprintf-remove-accidental-vla-usage.patch sysctl-add-flags-to-support-min-max-range-clamping-fix.patch linux-next-rejects.patch linux-next-fixup.patch drivers-gpu-drm-i915-intel_guc_logc-work-around-gcc-444-union-initializer-issue.patch fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch headers-untangle-kmemleakh-from-mmh-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html