Print this page
10687 Service routine cast changes need smatch fixes

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/inet/ip/spdsock.c
          +++ new/usr/src/uts/common/inet/ip/spdsock.c
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23   * Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved.
  24      - * Copyright 2017 Joyent, Inc.
       24 + * Copyright 2019, Joyent, Inc.
  25   25   */
  26   26  
  27   27  #include <sys/param.h>
  28   28  #include <sys/types.h>
  29   29  #include <sys/stream.h>
  30   30  #include <sys/strsubr.h>
  31   31  #include <sys/strsun.h>
  32   32  #include <sys/stropts.h>
  33   33  #include <sys/zone.h>
  34   34  #include <sys/vnode.h>
↓ open down ↓ 3567 lines elided ↑ open up ↑
3602 3602          mblk_t *mp;
3603 3603          ipsec_stack_t *ipss = ss->spdsock_spds->spds_netstack->netstack_ipsec;
3604 3604  
3605 3605          if (ss->spdsock_dump_req != NULL) {
3606 3606                  qenable(OTHERQ(q));
3607 3607                  return (0);
3608 3608          }
3609 3609  
3610 3610          while ((mp = getq(q)) != NULL) {
3611 3611                  if (ipsec_loaded(ipss)) {
3612      -                        spdsock_wput(q, mp);
     3612 +                        (void) spdsock_wput(q, mp);
3613 3613                          if (ss->spdsock_dump_req != NULL)
3614 3614                                  return (0);
3615 3615                  } else if (!ipsec_failed(ipss)) {
3616 3616                          (void) putq(q, mp);
3617 3617                  } else {
3618 3618                          spdsock_error(q, mp, EPFNOSUPPORT, 0);
3619 3619                  }
3620 3620          }
3621 3621          return (0);
3622 3622  }
↓ open down ↓ 147 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX