lkml.org 
[lkml]   [2006]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 010 of 14] knfsd: SUNRPC: add a "generic" function to see if the peer uses a secure port

    From: Chuck Lever <chuck.lever@oracle.com>
    The only reason svcsock.c looks at a sockaddr's port is to check whether
    the remote peer is connecting from a privileged port. Refactor this check
    to hide processing that is specific to address format.

    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
    Signed-off-by: Neil Brown <neilb@suse.de>

    ### Diffstat output
    ./net/sunrpc/svcsock.c | 20 +++++++++++++++++---
    1 file changed, 17 insertions(+), 3 deletions(-)
    diff .prev/net/sunrpc/svcsock.c ./net/sunrpc/svcsock.c
    --- .prev/net/sunrpc/svcsock.c 2006-12-13 10:32:15.000000000 +1100
    +++ ./net/sunrpc/svcsock.c 2006-12-13 10:32:17.000000000 +1100
    @@ -926,6 +926,20 @@ svc_tcp_data_ready(struct sock *sk, int
    wake_up_interruptible(sk->sk_sleep);
    }

    +static inline int svc_port_is_privileged(struct sockaddr *sin)
    +{
    + switch (sin->sa_family) {
    + case AF_INET:
    + return ntohs(((struct sockaddr_in *)sin)->sin_port) < 1024;
    +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
    + case AF_INET6:
    + return ntohs(((struct sockaddr_in6 *)sin)->sin6_port) < 1024;
    +#endif
    + default:
    + return 0;
    + }
    +}
    +
    /*
    * Accept a TCP connection
    */
    @@ -972,7 +986,7 @@ svc_tcp_accept(struct svc_sock *svsk)
    * hosts here, but when we get encryption, the IP of the host won't
    * tell us anything. For now just warn about unpriv connections.
    */
    - if (ntohs(sin.sin_port) >= 1024) {
    + if (!svc_port_is_privileged((struct sockaddr *) &sin)) {
    dprintk(KERN_WARNING
    "%s: connect from unprivileged port: %s\n",
    serv->sv_name,
    @@ -1313,7 +1327,6 @@ int
    svc_recv(struct svc_rqst *rqstp, long timeout)
    {
    struct svc_sock *svsk = NULL;
    - struct sockaddr_in *sin = svc_addr_in(rqstp);
    struct svc_serv *serv = rqstp->rq_server;
    struct svc_pool *pool = rqstp->rq_pool;
    int len, i;
    @@ -1408,7 +1421,8 @@ svc_recv(struct svc_rqst *rqstp, long ti
    svsk->sk_lastrecv = get_seconds();
    clear_bit(SK_OLD, &svsk->sk_flags);

    - rqstp->rq_secure = ntohs(sin->sin_port) < 1024;
    + rqstp->rq_secure =
    + svc_port_is_privileged(svc_addr(rqstp));
    rqstp->rq_chandle.defer = svc_defer;

    if (serv->sv_stats)
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-12-13 01:23    [from the cache]
    ©2003-2014 Jasper Spaans. Advertise on this site