From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D74A34CA264; Fri, 15 May 2026 16:06:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861182; cv=none; b=P1TZ2Zq5CKd10R4Hg/7FCM7jvvcFA0bLTfroP/+CF3H1klMPsy55bC/QtYboMBihK6Wsd++vrgHmIWv7utjeb9yOBzkDG0IU6g+Luu/8aEbfmtBRNXWaMW+p8Ch8dxaznYWjp5+gufI76+bvCd4Zbe92TOubud3DK0MDXaMEP08= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861182; c=relaxed/simple; bh=PvCiJ2vdNQSBwsehV3hzMTRinOaH/EDzdLFID9Rr4fM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ACz5OAm5spBLorKs0RSUmTZBP4Lei/cBNsbMzW6kvRRQVMI5N+3Ul7eIOpHeyiwucCUVcG4fj+CVANNB3TwJbO6w6ZRQTSHondVebFWVt1gONER1AiLO6kz+SXwaK72xBEl6WtEx0nY4Pgmo3YMRi7MWObG34dlKirQRTVD6T40= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WimqO1a2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WimqO1a2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CD89C2BCB0; Fri, 15 May 2026 16:06:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778861182; bh=PvCiJ2vdNQSBwsehV3hzMTRinOaH/EDzdLFID9Rr4fM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WimqO1a22l3uSa9nSk40+QxPtS/qv1rWOEk4XATJIkUxdBQHtFgMwZhXv31k3v97i l4fZ+PShrEBCCczLFvNB800lW7e/cZIQAl6CF1+v1GOb4+muc3TBF7LSemhvVvA7o8 V15J0VXWtFQU5FkA+EC1zHVR1skg+3NM2GX7uUN8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Yuan Tan , Yifan Wu , Juefei Pu , Xin Liu , Kuniyuki Iwashima , Jiexun Wang , Ren Wei , Jakub Kicinski Subject: [PATCH 6.6 229/474] af_unix: Reject SIOCATMARK on non-stream sockets Date: Fri, 15 May 2026 17:45:38 +0200 Message-ID: <20260515154719.961677988@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154715.053014143@linuxfoundation.org> References: <20260515154715.053014143@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiexun Wang commit d119775f2bad827edc28071c061fdd4a91f889a5 upstream. SIOCATMARK reports whether the receive queue is at the urgent mark for MSG_OOB. In AF_UNIX, MSG_OOB is supported only for SOCK_STREAM sockets. SOCK_DGRAM and SOCK_SEQPACKET reject MSG_OOB in sendmsg() and recvmsg(), so they should not support SIOCATMARK either. Return -EOPNOTSUPP for non-stream sockets before checking the receive queue. Fixes: 314001f0bf92 ("af_unix: Add OOB support") Cc: stable@kernel.org Reported-by: Yuan Tan Reported-by: Yifan Wu Reported-by: Juefei Pu Reported-by: Xin Liu Suggested-by: Kuniyuki Iwashima Signed-off-by: Jiexun Wang Signed-off-by: Ren Wei Reviewed-by: Kuniyuki Iwashima Link: https://patch.msgid.link/20260506140825.2987635-1-n05ec@lzu.edu.cn Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/unix/af_unix.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2807,6 +2807,9 @@ again: goto out; } + if (sk->sk_type != SOCK_STREAM) + return -EOPNOTSUPP; + mutex_lock(&u->iolock); goto redo; unlock: