lkml.org 
[lkml]   [2007]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 002 of 8] knfsd: rpc: fix server-side wrapping of krb5i replies

    It's not necessarily correct to assume that the xdr_buf used to hold the
    server's reply must have page data whenever it has tail data.

    And there's no need for us to deal with that case separately anyway.

    Acked-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    Signed-off-by: Neil Brown <neilb@suse.de>
    Cc: stable@kernel.org

    ### Diffstat output
    ./net/sunrpc/auth_gss/svcauth_gss.c | 8 +-------
    1 file changed, 1 insertion(+), 7 deletions(-)

    diff .prev/net/sunrpc/auth_gss/svcauth_gss.c ./net/sunrpc/auth_gss/svcauth_gss.c
    --- .prev/net/sunrpc/auth_gss/svcauth_gss.c 2007-05-07 10:30:18.000000000 +1000
    +++ ./net/sunrpc/auth_gss/svcauth_gss.c 2007-05-07 10:30:38.000000000 +1000
    @@ -1210,13 +1210,7 @@ svcauth_gss_wrap_resp_integ(struct svc_r
    if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset,
    integ_len))
    BUG();
    - if (resbuf->page_len == 0
    - && resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE
    - < PAGE_SIZE) {
    - BUG_ON(resbuf->tail[0].iov_len);
    - /* Use head for everything */
    - resv = &resbuf->head[0];
    - } else if (resbuf->tail[0].iov_base == NULL) {
    + if (resbuf->tail[0].iov_base == NULL) {
    if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE > PAGE_SIZE)
    goto out_err;
    resbuf->tail[0].iov_base = resbuf->head[0].iov_base
    -
    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: 2007-05-07 02:39    [W:0.031 / U:30.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site