samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Ensure an nbuf is not mapped during free

Browse Source 
Currently, there is no logic to ensure a given nbuf has been properly
unmapped when it is freed. This can lead to side-effects when the same
address is allocated for an nbuf in the future. Ensure a given nbuf has
been unmapped during free to ensure all nbufs are properly unmapped.

Change-Id: I925af1fbbbde6baa0f12a4468a33332bc75bdfbc
CRs-Fixed: 2271768
This commit is contained in:
Dustin Brown
2018-06-26 17:22:39 -07:00
committed by nshrivas
parent dbbaef4f81
commit 25855170f7
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
qdf/linux/src/qdf_nbuf.c
View File

@@ -679,8 +679,9 @@ qdf_nbuf_track_map(qdf_nbuf_t nbuf, const char *file, uint32_t line)
meta = qdf_nbuf_meta_get(nbuf);
qdf_spin_unlock_irqrestore(&qdf_nbuf_map_lock);
if (meta)
panic("Double nbuf map detected @ %s:%u",
kbasename(file), line);
QDF_DEBUG_PANIC(
"Double nbuf map detected @ %s:%u; last map from %s:%u",
kbasename(file), line, meta->file, meta->line);
meta = qdf_flex_mem_alloc(&qdf_nbuf_map_pool);
if (!meta) {
@@ -716,7 +717,8 @@ qdf_nbuf_untrack_map(qdf_nbuf_t nbuf, const char *file, uint32_t line)
meta = qdf_nbuf_meta_get(nbuf);
if (!meta)
panic("Double nbuf unmap or unmap without map detected @%s:%u",
QDF_DEBUG_PANIC(
"Double nbuf unmap or unmap without map detected @ %s:%u",
kbasename(file), line);
hash_del(&meta->node);
@@ -2636,6 +2638,14 @@ void qdf_nbuf_free_debug(qdf_nbuf_t nbuf, uint8_t *file, uint32_t line)
/* Remove SKB from internal QDF tracking table */
if (qdf_likely(nbuf)) {
struct qdf_nbuf_map_metadata *meta;
meta = qdf_nbuf_meta_get(nbuf);
if (meta)
QDF_DEBUG_PANIC(
"Nbuf freed @ %s:%u while mapped from %s:%u",
kbasename(file), line, meta->file, meta->line);
qdf_net_buf_debug_delete_node(nbuf);
qdf_nbuf_history_add(nbuf, file, line, QDF_NBUF_FREE);
}