On Mon, Jul 29, 2019 at 08:55:21PM +0200, Enrico Weigelt, metux IT consult wrote: > From: Enrico Weigelt <info@xxxxxxxxx> > > IS_ERR() already calls unlikely(), so this extra unlikely() call > around IS_ERR() is not needed. > > Signed-off-by: Enrico Weigelt <info@xxxxxxxxx> Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@xxxxxxxxx> > --- > net/sctp/socket.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/sctp/socket.c b/net/sctp/socket.c > index aa80cda..9d1f83b 100644 > --- a/net/sctp/socket.c > +++ b/net/sctp/socket.c > @@ -985,7 +985,7 @@ static int sctp_setsockopt_bindx(struct sock *sk, > return -EINVAL; > > kaddrs = memdup_user(addrs, addrs_size); > - if (unlikely(IS_ERR(kaddrs))) > + if (IS_ERR(kaddrs)) > return PTR_ERR(kaddrs); > > /* Walk through the addrs buffer and count the number of addresses. */ > @@ -1315,7 +1315,7 @@ static int __sctp_setsockopt_connectx(struct sock *sk, > return -EINVAL; > > kaddrs = memdup_user(addrs, addrs_size); > - if (unlikely(IS_ERR(kaddrs))) > + if (IS_ERR(kaddrs)) > return PTR_ERR(kaddrs); > > /* Allow security module to validate connectx addresses. */ > -- > 1.9.1 >
