From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cong Wang Subject: Re: [PATCH net v2 2/3] unix/dgram: fix peeking with an offset larger than data in queue Date: Mon, 29 Apr 2013 07:01:39 +0000 (UTC) Message-ID: References: <1366915736.8964.171.camel@edumazet-glaptop> <1367001312-6719-1-git-send-email-bpoirier@suse.de> <1367001312-6719-2-git-send-email-bpoirier@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org To: linux-kernel@vger.kernel.org Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On Fri, 26 Apr 2013 at 18:35 GMT, Benjamin Poirier wrote: > struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags, > - int *peeked, int *off, int *err) > + int *peeked, int *_off, int *err) > { > - struct sk_buff *skb; > + struct sk_buff *skb, *last; > long timeo; > /* > * Caller is allowed not to check sk->sk_err before skb_recv_datagram() > @@ -182,14 +183,17 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags, > */ > unsigned long cpu_flags; > struct sk_buff_head *queue = &sk->sk_receive_queue; > + int off = *_off; > Name the local variable '_off', not the function argument. Or pick another name, e.g. 'offset'.