>-----Original Message----- >From: dri-devel <dri-devel-boun...@lists.freedesktop.org> On Behalf Of >Kees Cook >Sent: Wednesday, September 21, 2022 11:10 PM >To: Vlastimil Babka <vba...@suse.cz> >Cc: linux-wirel...@vger.kernel.org; Jacob Shin <jacob.s...@amd.com>; >l...@lists.linux.dev; dri-devel@lists.freedesktop.org; linux...@kvack.org; >Eric Dumazet <eduma...@google.com>; Nguyen, Anthony L ><anthony.l.ngu...@intel.com>; linux-harden...@vger.kernel.org; Sumit >Semwal <sumit.sem...@linaro.org>; d...@openvswitch.org; x...@kernel.org; >Brandeburg, Jesse <jesse.brandeb...@intel.com>; intel-wired- >l...@lists.osuosl.org; David Rientjes <rient...@google.com>; Miguel Ojeda ><oj...@kernel.org>; Yonghong Song <y...@fb.com>; Paolo Abeni ><pab...@redhat.com>; linux-me...@vger.kernel.org; Marco Elver ><el...@google.com>; Kees Cook <keesc...@chromium.org>; Josef Bacik ><jo...@toxicpanda.com>; linaro-mm-...@lists.linaro.org; Jakub Kicinski ><k...@kernel.org>; David Sterba <dste...@suse.com>; Joonsoo Kim ><iamjoonsoo....@lge.com>; Alex Elder <el...@kernel.org>; Greg Kroah- >Hartman <gre...@linuxfoundation.org>; Nick Desaulniers ><ndesaulni...@google.com>; linux-ker...@vger.kernel.org; David S. Miller ><da...@davemloft.net>; Pekka Enberg <penb...@kernel.org>; Daniel >Micay <danielmi...@gmail.com>; net...@vger.kernel.org; linux- >fsde...@vger.kernel.org; Andrew Morton <a...@linux-foundation.org>; >Christian König <christian.koe...@amd.com>; linux-bt...@vger.kernel.org >Subject: [PATCH 07/12] igb: Proactively round up to kmalloc bucket size > >Instead of having a mismatch between the requested allocation size and >the actual kmalloc bucket size, which is examined later via ksize(), >round up proactively so the allocation is explicitly made for the full >size, allowing the compiler to correctly reason about the resulting size >of the buffer through the existing __alloc_size() hint. > >Cc: Jesse Brandeburg <jesse.brandeb...@intel.com> >Cc: Tony Nguyen <anthony.l.ngu...@intel.com> >Cc: "David S. Miller" <da...@davemloft.net> >Cc: Eric Dumazet <eduma...@google.com> >Cc: Jakub Kicinski <k...@kernel.org> >Cc: Paolo Abeni <pab...@redhat.com> >Cc: intel-wired-...@lists.osuosl.org >Cc: net...@vger.kernel.org >Signed-off-by: Kees Cook <keesc...@chromium.org> >--- > drivers/net/ethernet/intel/igb/igb_main.c | 1 + > 1 file changed, 1 insertion(+) > >diff --git a/drivers/net/ethernet/intel/igb/igb_main.c >b/drivers/net/ethernet/intel/igb/igb_main.c >index 2796e81d2726..4d70ee5b0f79 100644 >--- a/drivers/net/ethernet/intel/igb/igb_main.c >+++ b/drivers/net/ethernet/intel/igb/igb_main.c >@@ -1196,6 +1196,7 @@ static int igb_alloc_q_vector(struct igb_adapter >*adapter, > > ring_count = txr_count + rxr_count; > size = struct_size(q_vector, ring, ring_count); >+ size = kmalloc_size_roundup(size);
why not: size = kmalloc_size_roundup(struct_size(q_vector, ring, ring_count)); ? m > /* allocate q_vector and rings */ > q_vector = adapter->q_vector[v_idx]; >-- >2.34.1