Re: [PATCH 1/2] landlock: Add hook on socket_listen()
From: Ivanov Mikhail <hidden>
Date: 2024-06-28 16:51:12
Also in:
netdev, netfilter-devel
6/19/2024 10:05 PM, Günther Noack wrote:
I agree with Mickaël's comment: this seems like an important fix. Mostly for completeness: I played with the "socket type" patch set in a "TCP server" example, where *all* possible operations are restricted with Landlock, including the ones from the "socket type" patch set V2 with the little fix we discussed. - socket() - bind() - enforce a landlock ruleset restricting: - file system access - all TCP bind and connect - socket creation - listen() - accept()quoted
From the connection handler (which would be the place where an attacker canusually provide input), it is now still possible to bind a socket due to this problem. The steps are: 1) connect() on client_fd with AF_UNSPEC to disassociate the client FD 2) listen() on the client_fd This succeeds and it listens on an ephemeral port. The code is at [1], if you are interested. [1] https://github.com/gnoack/landlock-examples/blob/main/tcpserver.c
Do you mean that this scenario works with patch-fix currently being discussed?
On Mon, May 13, 2024 at 03:15:50PM +0300, Ivanov Mikhail wrote:quoted
4/30/2024 4:36 PM, Mickaël Salaün wrote:quoted
On Mon, Apr 08, 2024 at 05:47:46PM +0800, Ivanov Mikhail wrote:quoted
Make hook for socket_listen(). It will check that the socket protocol is TCP, and if the socket's local port number is 0 (which means, that listen(2) was called without any previous bind(2) call), then listen(2) call will be legitimate only if there is a rule for bind(2) allowing binding to port 0 (or if LANDLOCK_ACCESS_NET_BIND_TCP is not supported by the sandbox).Thanks for this patch and sorry for the late full review. The code is good overall. We should either consider this patch as a fix or add a new flag/access right to Landlock syscalls for compatibility reason. I think this should be a fix. Calling listen(2) without a previous call to bind(2) is a corner case that we should properly handle. The commit message should make that explicit and highlight the goal of the patch: first explain why, and then how.Yeap, this is fix-patch. I have covered motivation and proposed solution in cover letter. Do you have any suggestions on how i can improve this?Without wanting to turn around the direction of this code review now, I am still slightly concerned about the assymetry of this special case being implemented for listen() but not for connect(). The reason is this: My colleague Mr. B. recently pointed out to me that you can also do a bind() on a socket before a connect(!). The steps are: * create socket with socket() * bind() to a local port 9090 * connect() to a remote port 8080 This gives you a connection between ports 9090 and 8080. A regular connect() without an explicit bind() is of course the more usual scenario. In that case, we are also using up ("implicitly binding") one of the ephemeral ports. It seems that, with respect to the port binding, listen() and connect() work quite similarly then? This being considered, maybe it *is* the listen() operation on a port which we should be restricting, and not bind()?
Do you mean that ability to restrict auto-binding for connect() should also be implemented? This looks like good idea if we want to provide full control over port binding. But it's hard for me to come up with an idea how it can be implemented: current Landlock API allows to restrict only the destination port for connect(). I think an independent restriction of auto-binding for bind() and listen() is a good approach: API is more clear and Landlock rules do not affect each other's behavior. Did I understood your suggestion correctly?
With some luck, that would then also free us from having to implement the check_tcp_socket_can_listen() logic, which is seemingly emulating logic from elsewhere in the kernel?
But check_tcp_socket_can_listen() will be required for LANDLOCK_ACCESS_NET_LISTEN_TCP hook anyway. Did I miss smth?
(I am by far not an expert in Linux networking, so I'll put this out for consideration and will happily stand corrected if I am misunderstanding something. Maybe someone with more networking background can chime in?)quoted
quoted
quoted
+ /* Socket is alredy binded to some port. */This kind of spelling issue can be found by scripts/checkpatch.plwill be fixedP.S. there are two typos here, the obvious one in "alredy", but also the passive of "to bind" is "bound", not "binded". (That is also mis-spelled in a few more places I think.)
Thanks, I'll fix them.
—Günther