lkml.org 
[lkml]   [2012]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/x86/x32] fs: fix close_on_exec pointer in alloc_fdtable
    Date
    alloc_fdtable allocates space for the open_fds and close_on_exec
    bitfields together, as 2 * nr / BITS_PER_BYTE. close_on_exec needs to
    point to open_fds + nr / BITS_PER_BYTE, not open_fds + nr /
    BITS_PER_LONG, as introducted in 1fd36adc: Replace the fd_sets in
    struct fdtable with an array of unsigned longs.

    Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
    ---
    fs/file.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/fs/file.c b/fs/file.c
    index 2d479dd..171f6b4 100644
    --- a/fs/file.c
    +++ b/fs/file.c
    @@ -179,7 +179,7 @@ static struct fdtable * alloc_fdtable(unsigned int nr)
    if (!data)
    goto out_arr;
    fdt->open_fds = data;
    - data += nr / BITS_PER_LONG;
    + data += nr / BITS_PER_BYTE;
    fdt->close_on_exec = data;
    fdt->next = NULL;

    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-02-22 06:33    [W:0.050 / U:30.616 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site