From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Serge E. Hallyn" Subject: Re: [PATCH] Fix acquiring socket lock before reading RTNETLINK response Date: Thu, 22 Apr 2010 17:54:44 -0500 Message-ID: <20100422225444.GA9992@us.ibm.com> References: <1271966546-20791-1-git-send-email-danms@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1271966546-20791-1-git-send-email-danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Dan Smith Cc: containers-qjLDD68F18O7TbgM5vRIOg@public.gmane.org List-Id: containers.vger.kernel.org Quoting Dan Smith (danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org): > Signed-off-by: Dan Smith Looks good to my limited understanding. Acked-by: Serge Hallyn > --- > net/checkpoint_dev.c | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/net/checkpoint_dev.c b/net/checkpoint_dev.c > index 7ccb899..2787892 100644 > --- a/net/checkpoint_dev.c > +++ b/net/checkpoint_dev.c > @@ -136,11 +136,12 @@ static struct nlmsghdr *rtnl_get_response(struct socket *rtnl, > > *skb = NULL; > > + lock_sock(rtnl->sk); > ret = sk_wait_data(rtnl->sk, &timeo); > - if (!ret) > - return ERR_PTR(-EPIPE); > + if (ret) > + *skb = skb_dequeue(&rtnl->sk->sk_receive_queue); > + release_sock(rtnl->sk); > > - *skb = skb_dequeue(&rtnl->sk->sk_receive_queue); > if (!*skb) > return ERR_PTR(-EPIPE); > > -- > 1.6.2.5 > > _______________________________________________ > Containers mailing list > Containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org > https://lists.linux-foundation.org/mailman/listinfo/containers