github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: strparser: remove strp->sk NULL checks

Browse Source 
strp_init makes sure strp->sk != NULL.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Link: https://patch.msgid.link/a823a8decf85b3586e50adf8c6d768f59538140a.1790702233.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Sabrina Dubroca 2026-10-01 09:57:26 +02:00 committed by Jakub Kicinski
parent ed0e5b924d
commit 05e37190ba
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
net/strparser/strparser.c
View File

@ -36,6 +36,8 @@ static inline struct _strp_msg *_strp_msg(struct sk_buff *skb)
/* Lower lock held */
static void strp_abort_strp(struct strparser *strp, int err)
{
struct sock *sk = strp->sk;
/* Unrecoverable error in receive */
cancel_delayed_work(&strp->msg_timer_work);
@ -53,13 +55,9 @@ static void strp_abort_strp(struct strparser *strp, int err)
strp->skb_nextp = NULL;
strp->need_bytes = 0;
if (strp->sk) {
struct sock *sk = strp->sk;
/* Report an error on the lower socket */
sk->sk_err = -err;
sk_error_report(sk);
}
/* Report an error on the lower socket */
sk->sk_err = -err;
sk_error_report(sk);
}
static void strp_start_timer(struct strparser *strp, long timeo)
@ -80,17 +78,9 @@ static void strp_parser_err(struct strparser *strp, int err,
static inline int strp_peek_len(struct strparser *strp)
{
if (strp->sk) {
struct socket *sock = strp->sk->sk_socket;
struct socket *sock = strp->sk->sk_socket;
return sock->ops->peek_len(sock);
}
/* If we don't have an associated socket there's nothing to peek.
* Return int max to avoid stopping the strparser.
*/
return INT_MAX;
return sock->ops->peek_len(sock);
}
/* Lower socket lock held */