In case it's possible to race with other tasks sharing the fdtable, check for NULL file * and exit with an error. Please consider merging this with the first patch in the series of epoll patches posted recently. Reported-by: "Serge E. Hallyn" <serue@xxxxxxxxxx> Signed-off-by: Matt Helsley <matthltc@xxxxxxxxxx> Cc: "Serge E. Hallyn" <serue@xxxxxxxxxx> --- fs/eventpoll.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index c261263..638f9d7 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1677,7 +1677,8 @@ struct file* ep_file_restore(struct ckpt_ctx *ctx, return ERR_PTR(epfd); epfile = fget(epfd); sys_close(epfd); /* harmless even if an error occured */ - BUG_ON(!epfile); + if (!epfile) + return ERR_PTR(-EBADF); /* * Needed before we can properly restore the watches and enforce the -- 1.5.6.3 _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers
