contigmem: cleanup properly when load fails
PATCH 1/1 contigmem: cleanup properly when load fails
If contigmem is not able to allocate all of the requested buffers, it frees whatever buffers were able to be allocated up until that point.
But the pointers are not set to NULL in that case. After the load fails, the FreeBSD kernel will immediately call the contigmem unload handler, which tries to free the buffers again since the pointers were not set to NULL.
It's not clear that we should just rely on the unload handler getting called after load failure. So let's keep the existing cleanup code in the load handler, but explicitly set the pointers to NULL after freeing them.
--- kernel/freebsd/contigmem/contigmem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/freebsd/contigmem/contigmem.c +3 -1
@@ -165,9 +165,11 @@ contigmem_load() error:for (i =0 ; i < contigmem_num_buffers; i++) { -if (contigmem_buffers[i].addr !=NULL ) +if (contigmem_buffers[i].addr !=NULL ) {contigfree (contigmem_buffers[i].addr, contigmem_buffer_size,M_CONTIGMEM ); + contigmem_buffers[i].addr =NULL ; + }if (mtx_initialized (&contigmem_buffers[i].mtx))mtx_destroy (&contigmem_buffers[i].mtx); }
Signature · 1 line
2.20.1
Quoted 10 lines · Jim Harris
If contigmem is not able to allocate all of the requested buffers, it frees whatever buffers were able to be allocated up until that point.
But the pointers are not set to NULL in that case. After the load fails, the FreeBSD kernel will immediately call the contigmem unload handler, which tries to free the buffers again since the pointers were not set to NULL.
Quoted 8 lines
It's not clear that we should just rely on the unload handler getting called after load failure. So let's keep the existing cleanup code in the load handler, but explicitly set the pointers to NULL after freeing them.
Signed-off-by Jim Harris <[email protected]>---
Quoted 12 lines · Bruce Richardson
Quoted 10 lines · Jim Harris
If contigmem is not able to allocate all of the requested buffers, it frees whatever buffers were able to be allocated up until that point.
But the pointers are not set to NULL in that case. After the load fails, the FreeBSD kernel will immediately call the contigmem unload handler, which tries to free the buffers again since the pointers were not set to NULL.
Quoted 5 lines
Quoted 5 lines
It's not clear that we should just rely on the unload handler getting called after load failure. So let's keep the existing cleanup code in the load handler, but explicitly set the pointers to NULL after freeing them.
Can you check this Fixes is correct?
Signature · 1 line
David Marchand
On 3/19/20, 5:54 AM, "David Marchand" <[email protected]> wrote:
On Tue, Mar 10, 2020 at 10:32 AM Bruce Richardson <[email protected]> wrote:
>
> On Mon, Mar 09, 2020 at 03:00:25AM -0700, Jim Harris wrote:
> > If contigmem is not able to allocate all of the > > requested buffers, it frees whatever buffers were > > able to be allocated up until that point.
> >
> > But the pointers are not set to NULL in that case. > > After the load fails, the FreeBSD kernel will
> > immediately call the contigmem unload handler, which > > tries to free the buffers again since the pointers > > were not set to NULL.
> >
> > It's not clear that we should just rely on the unload > > handler getting called after load failure. So let's > > keep the existing cleanup code in the load handler, > > but explicitly set the pointers to NULL after freeing > > them.
Can you check this Fixes is correct?
Yes - that's correct. Thanks!
-Jim
David Marchand
AppliedQuoted 12 lines · Bruce Richardson
Quoted 10 lines · Jim Harris
If contigmem is not able to allocate all of the requested buffers, it frees whatever buffers were able to be allocated up until that point.
But the pointers are not set to NULL in that case. After the load fails, the FreeBSD kernel will immediately call the contigmem unload handler, which tries to free the buffers again since the pointers were not set to NULL.
Quoted 5 lines
Quoted 5 lines
It's not clear that we should just rely on the unload handler getting called after load failure. So let's keep the existing cleanup code in the load handler, but explicitly set the pointers to NULL after freeing them.
Quoted 5 lines
Quoted 3 lines
Signed-off-by Jim Harris <[email protected]>---
Acked-by Bruce Richardson <[email protected]>
Applied, thanks.
Signature · 1 line
David Marchand